cleanup: include guards

BrandMeister · Nov 8, 2020 · b35a0c5 · b35a0c5
1 parent f25a5a6
commit b35a0c5
Show file tree

Hide file tree

Showing 53 changed files with 54 additions and 214 deletions.
diff --git a/AMBEFEC.h b/AMBEFEC.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(AMBEFEC_H)
-#define	AMBEFEC_H
+#pragma once
 
 class CAMBEFEC {
 public:
@@ -29,5 +28,3 @@ class CAMBEFEC {
 private:
 	unsigned int regenerateDMR(unsigned int& a, unsigned int& b,unsigned int& c) const;
 };
-
-#endif
diff --git a/BCH.h b/BCH.h
@@ -16,8 +16,7 @@
 *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#if !defined(BCH_H)
-#define	BCH_H
+#pragma once
 
 class CBCH {
 public:
@@ -29,5 +28,3 @@ class CBCH {
 private:
 	void encode(const int* data, int* bb);
 };
-
-#endif
diff --git a/BPTC19696.h b/BPTC19696.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(BPTC19696_H)
-#define	BPTC19696_H
+#pragma once
 
 class CBPTC19696
 {
@@ -43,5 +42,3 @@ class CBPTC19696
 	void encodeErrorCheck();
 	void encodeExtractBinary(unsigned char* data);
 };
-
-#endif
diff --git a/CASTInfo.h b/CASTInfo.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(CASTINFO_H)
-#define	CASTINFO_H
+#pragma once
 
 #include "Display.h"
 
@@ -54,5 +53,3 @@ class CCASTInfo : public CDisplay
   	CModem*		m_modem;
 	std::string	m_ipaddress;
 };
-
-#endif
diff --git a/CRC.h b/CRC.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(CRC_H)
-#define	CRC_H
+#pragma once
 
 class CCRC
 {
@@ -33,5 +32,3 @@ class CCRC
 
 	static unsigned char crc8(const unsigned char* in, unsigned int length);
 };
-
-#endif
diff --git a/Conf.h b/Conf.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(CONF_H)
-#define	CONF_H
+#pragma once
 
 #include <string>
 #include <vector>
@@ -259,5 +258,3 @@ class CConf
   unsigned int m_nextionScreenLayout;
   bool         m_nextionTempInFahrenheit;
 };
-
-#endif
diff --git a/DMRAccessControl.h b/DMRAccessControl.h
@@ -15,8 +15,8 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  */
-#if !defined(DMRAccessControl_H)
-#define	DMRAccessControl_H
+
+#pragma once
 
 #include <vector>
 
@@ -40,5 +40,3 @@ class CDMRAccessControl {
 	static bool m_selfOnly;
 	static unsigned int m_id;
 };
-
-#endif
diff --git a/DMRCSBK.h b/DMRCSBK.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(DMRCSBK_H)
-#define DMRCSBK_H
+#pragma once
 
 #include "DMRDefines.h"
 
@@ -76,5 +75,3 @@ class CDMRCSBK
 	bool           m_dataContent;
 	unsigned char  m_CBF;
 };
-
-#endif
diff --git a/DMRControl.h b/DMRControl.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(DMRControl_H)
-#define	DMRControl_H
+#pragma once
 
 #include "RSSIInterpolator.h"
 #include "DMRNetwork.h"
@@ -54,5 +53,3 @@ class CDMRControl {
 	CDMRSlot     m_slot1;
 	CDMRSlot     m_slot2;
 };
-
-#endif
diff --git a/DMRData.h b/DMRData.h
@@ -11,8 +11,7 @@
  *	GNU General Public License for more details.
  */
 
-#ifndef DMRData_H
-#define	DMRData_H
+#pragma once
 
 #include "DMRDefines.h"
 
@@ -66,5 +65,3 @@ class CDMRData {
 	unsigned char  m_ber;
 	unsigned char  m_rssi;
 };
-
-#endif
diff --git a/DMRDataHeader.h b/DMRDataHeader.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DMRDataHeader_H
-#define DMRDataHeader_H
+#pragma once
 
 class CDMRDataHeader
 {
@@ -49,6 +48,3 @@ class CDMRDataHeader
 	bool           m_S;
 	unsigned char  m_Ns;
 };
-
-#endif
-
diff --git a/DMRDefines.h b/DMRDefines.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(DMRDefines_H)
-#define	DMRDefines_H
+#pragma once
 
 #include "Defines.h"		// For TAG_DATA
 
@@ -119,5 +118,3 @@ enum FLCO {
 	FLCO_TALKER_ALIAS_BLOCK3 = 7,
 	FLCO_GPS_INFO            = 8
 };
-
-#endif
diff --git a/DMREMB.h b/DMREMB.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(DMREMB_H)
-#define DMREMB_H
+#pragma once
 
 class CDMREMB
 {
@@ -42,5 +41,3 @@ class CDMREMB
 	bool          m_PI;
 	unsigned char m_LCSS;
 };
-
-#endif
diff --git a/DMREmbeddedData.h b/DMREmbeddedData.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DMREmbeddedData_H
-#define DMREmbeddedData_H
+#pragma once
 
 #include "DMRDefines.h"
 #include "DMRLC.h"
@@ -59,5 +58,3 @@ class CDMREmbeddedData
 	void decodeEmbeddedData();
 	void encodeEmbeddedData();
 };
-
-#endif
diff --git a/DMRFullLC.h b/DMRFullLC.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DMRFullLC_H
-#define DMRFullLC_H
+#pragma once
 
 #include "DMRLC.h"
 #include "DMRSlotType.h"
@@ -37,6 +36,3 @@ class CDMRFullLC
 private:
 	CBPTC19696 m_bptc;
 };
-
-#endif
-
diff --git a/DMRLC.h b/DMRLC.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(DMRLC_H)
-#define DMRLC_H
+#pragma once
 
 #include "DMRDefines.h"
 
@@ -60,6 +59,3 @@ class CDMRLC
 	unsigned int  m_srcId;
 	unsigned int  m_dstId;
 };
-
-#endif
-
diff --git a/DMRNetwork.h b/DMRNetwork.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(DMRNetwork_H)
-#define	DMRNetwork_H
+#pragma once
 
 #include "UDPSocket.h"
 #include "Timer.h"
@@ -113,5 +112,3 @@ class CDMRNetwork
 
 	bool write(const unsigned char* data, unsigned int length);
 };
-
-#endif
diff --git a/DMRShortLC.h b/DMRShortLC.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(DMRSHORTLC_H)
-#define	DMRSHORTLC_H
+#pragma once
 
 class CDMRShortLC
 {
@@ -43,5 +42,3 @@ class CDMRShortLC
 	void encodeErrorCheck();
 	void encodeExtractBinary(unsigned char* data);
 };
-
-#endif
diff --git a/DMRSlot.h b/DMRSlot.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(DMRSlot_H)
-#define	DMRSlot_H
+#pragma once
 
 #include "RSSIInterpolator.h"
 #include "DMREmbeddedData.h"
@@ -152,5 +151,3 @@ class CDMRSlot {
 
 	static void setShortLC(unsigned int slotNo, unsigned int id, FLCO flco = FLCO_GROUP, ACTIVITY_TYPE type = ACTIVITY_NONE);
 };
-
-#endif
diff --git a/DMRSlotType.h b/DMRSlotType.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(DMRSLOTTYPE_H)
-#define DMRSLOTTYPE_H
+#pragma once
 
 class CDMRSlotType
 {
@@ -38,5 +37,3 @@ class CDMRSlotType
 	unsigned char m_colorCode;
 	unsigned char m_dataType;
 };
-
-#endif
diff --git a/DMRTA.h b/DMRTA.h
@@ -12,8 +12,7 @@
 *	GNU General Public License for more details.
 */
 
-#ifndef	DMRTA_H
-#define	DMRTA_H
+#pragma once
 
 class CDMRTA {
 public:
@@ -31,5 +30,3 @@ class CDMRTA {
     char            m_TA[32];
     unsigned char   m_buf[32];
 };
-
-#endif
diff --git a/DMRTrellis.h b/DMRTrellis.h
@@ -11,8 +11,7 @@
 *	GNU General Public License for more details.
 */
 
-#ifndef	DMRTrellis_H
-#define	DMRTrellis_H
+#pragma once
 
 class CDMRTrellis {
 public:
@@ -32,5 +31,3 @@ class CDMRTrellis {
 	bool fixCode(unsigned char* points, unsigned int failPos, unsigned char* payload) const;
 	unsigned int checkCode(const unsigned char* points, unsigned char* tribits) const;
 };
-
-#endif
diff --git a/Defines.h b/Defines.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(Defines_H)
-#define	Defines_H
+#pragma once
 
 const unsigned char MODE_IDLE    = 0U;
 const unsigned char MODE_DMR     = 2U;
@@ -73,5 +72,3 @@ enum DMR_OVCM_TYPES {
 	DMR_OVCM_TX_ON,
 	DMR_OVCM_ON
 };
-
-#endif
diff --git a/Display.h b/Display.h
@@ -16,8 +16,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(DISPLAY_H)
-#define	DISPLAY_H
+#pragma once
 
 #include "Timer.h"
 
@@ -85,5 +84,3 @@ class CDisplay
 	unsigned char m_mode1;
 	unsigned char m_mode2;
 };
-
-#endif