Fixing include guards and transitioning to using pragma once

Src/Common/Allocators/PooledAlloc.h

@@ -2,8 +2,7 @@
 //
 // Copyright (c) 2005 David Ward
 
-#ifndef __PooledAlloc_h__
-#define __PooledAlloc_h__
+#pragma once
 
 // CPooledAlloc allocates objects T in fixed-size blocks (specified in the constructor) 
 // Alloc returns an uninitialized T*
@@ -54,4 +53,3 @@ template<typename T> void CPooledAlloc<T>::Free(T *pFree) {
   m_vpFree.push_back(pFree);
 }
 
-#endif // __include__

Src/Common/Allocators/SimplePooledAlloc.h

@@ -2,8 +2,7 @@
 //
 // Copyright (c) 2005 David Ward
 
-#ifndef __SimplePooledAlloc_h__
-#define __SimplePooledAlloc_h__
+#pragma once
 
 // CSimplePooledAlloc allocates objects T in fixed-size blocks (specified) 
 // Alloc returns a default-constructed T*
@@ -67,4 +66,3 @@ template < typename T > T * CSimplePooledAlloc < T >::Alloc() {
   return m_vPool.back()->Alloc();
 }
 
-#endif // __include__

Src/Common/AppSettingsData.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #include "AppSettingsHeader.h"
 #include "../DasherCore/Parameters.h"
 

Src/Common/AppSettingsHeader.h

@@ -1,5 +1,4 @@
-#ifndef __appsettingsheader_h__
-#define __appsettingsheader_h__
+#pragma once
 
 #include "../DasherCore/Parameters.h"
 #ifdef HAVE_CONFIG_H
@@ -31,4 +30,3 @@ enum {
   APP_STYLE_COMPOSE,
   APP_STYLE_DIRECT,
   APP_STYLE_FULLSCREEN };
-#endif

Src/Common/Globber.h

@@ -6,8 +6,7 @@
 //  Copyright 2011 Cambridge University. All rights reserved.
 //
 
-#ifndef __GLOBBER_H__
-#define __GLOBBER_H__
+#pragma once
 
 #include "../DasherCore/AbstractXMLParser.h"
 
@@ -19,4 +18,3 @@ void globScan(AbstractParser *parser,
               const char **sysPaths, 
               int(*error_callback)(const char *,int));
 
-#endif

Src/Common/I18n.h

@@ -18,8 +18,7 @@
 // along with Dasher; if not, write to the Free Software 
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#ifndef __i18n_h__
-#define __i18n_h__
+#pragma once
 
 #if defined(_WIN32) || defined(__APPLE__)
 
@@ -42,4 +41,3 @@
 
 #endif
 
-#endif

Src/Common/MSVC_Unannoy.h

@@ -1,5 +1,4 @@
-#ifndef __MSVC_Unannoy_h__
-#define __MSVC_Unannoy_h__
+#pragma once
 
 // Sorry about this frequently included header non-VC++ users.
 // It shouldn't do any harm.
@@ -15,4 +14,3 @@
 #pragma warning(disable:4996)   // warning C4996: 'fopen' was declared deprecated
 #endif
 
-#endif /* #ifndef __MSVC_Unannoy_h__ */

Src/Common/ModuleSettings.h

@@ -1,5 +1,4 @@
-#ifndef __ModuleSettings_h__
-#define __ModuleSettings_h__
+#pragma once
 
 enum setting_t {
   T_BOOL,
@@ -20,4 +19,3 @@ struct _SModuleSettings {
   const char *szDescription;
 };
 
-#endif

Src/Common/NoClones.h

@@ -1,5 +1,4 @@
-#ifndef __NoClones_h__
-#define __NoClones_h__
+#pragma once
 
 /* Explanation of NoClones {{{
 
@@ -36,4 +35,3 @@ class NoClones {
   NoClones & operator=(const NoClones &);
 };
 
-#endif /* #ifndef __NoClones_h__ */

Src/Common/OpenGLScreen.h

@@ -5,6 +5,9 @@
 //  Created by Alan Lawrence on 20/03/2009.
 //  Copyright 2009 Cavendish Laboratory. All rights reserved.
 //
+
+#pragma once
+
 #if TARGET_OS_IPHONE
 #import <OpenGLES/ES1/gl.h>
 #else

Src/Common/Platform/stdminmax.h

@@ -6,8 +6,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __Platform_stdminmax__
-#define __Platform_stdminmax__
+#pragma once
 
 #if _MSC_VER < 1300
 
@@ -21,4 +20,3 @@ namespace std {
 };
 #endif
 
-#endif // __Platform_stdminmax__

Src/Common/SBTree.h

@@ -7,6 +7,8 @@
  *
  */
 
+ #pragma once
+
 class SBTree {
 public:
     SBTree(int iValue);

Src/Common/Trace.h

@@ -2,8 +2,7 @@
 //
 // Copyright (c) 2005 David Ward
 
-#ifndef __Common_Trace_h__
-#define __Common_Trace_h__
+#pragma once
 
 // Trace is a mechanism for printf-like debugging that can be switched on/off
 // at compile time
@@ -50,4 +49,3 @@ inline void DasherTraceOutput(const char *pszFormat, ...) {
 
 #endif // DASHER_TRACE
 
-#endif

Src/Common/Unicode/ConvertUTF.h

@@ -20,6 +20,8 @@
  * remains attached.
  */
 
+#pragma once
+
 /* ---------------------------------------------------------------------
 
     Conversions between UTF32, UTF-16, and UTF-8.  Header file.

Src/Common/myassert.h

@@ -18,8 +18,7 @@
 // along with Dasher; if not, write to the Free Software 
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#ifndef __assert_h__
-#define __assert_h__
+#pragma once
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -69,4 +68,3 @@
 
 #endif
 
-#endif // __assert_h__

Src/Common/mydebug.h

@@ -1,6 +1,4 @@
-#ifndef __mydebug_h__
-#define __mydebug_h__
+#pragma once
 
 #define DASHER_DEBUG(x) g_message(x)
 
-#endif

Src/Common/round.h

@@ -1,3 +1,5 @@
+#pragma once
+
 extern "C" {
 double round(double);
 }

Src/DasherCore/Alphabet/AlphInfo.h

@@ -18,8 +18,7 @@
 // along with Dasher; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#ifndef __ALPHINFO_H__
-#define __ALPHINFO_H__
+#pragma once
 
 
 #include "../DasherTypes.h"
@@ -167,4 +166,3 @@ class Dasher::CAlphInfo : public SGroupInfo {
 
 /// @}
 
-#endif /* #ifndef __AlphInfo_h__ */

Src/DasherCore/Alphabet/AlphabetMap.h

@@ -7,8 +7,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifndef __AlphabetMap_h__
-#define __AlphabetMap_h__
+#pragma once
 
 #ifndef _WIN32
 #include <sys/types.h>
@@ -176,4 +175,3 @@ class Dasher::CAlphabetMap {
 };
 /// \}
 
-#endif /* #ifndef __AlphabetMap_h__ */

Src/DasherCore/Alphabet/GroupInfo.h

@@ -1,5 +1,4 @@
-#ifndef __GROUP_INFO_H__
-#define __GROUP_INFO_H__
+#pragma once
 
 #include <string>
 
@@ -32,4 +31,3 @@ struct SGroupInfo {
 };
 
 
-#endif

Src/DasherCore/AlphabetManager.h

@@ -18,8 +18,7 @@
 // along with Dasher; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#ifndef __alphabetmanager_h__
-#define __alphabetmanager_h__
+#pragma once
 
 #include <map>
 
@@ -356,4 +355,3 @@ namespace Dasher {
 }
 
 
-#endif

Src/DasherCore/AlternatingDirectMode.h

@@ -2,8 +2,7 @@
 // DasherButtons.h
 // Copyright 2005 by Chris Ball
 
-#ifndef __ALTERNATING_DIRECT_MODE_H__
-#define __ALTERNATING_DIRECT_MODE_H__
+#pragma once
 
 #include "DasherButtons.h"
 
@@ -33,4 +32,3 @@ namespace Dasher {
 }
 /// @}
 
-#endif

Src/DasherCore/AutoSpeedControl.h

@@ -1,5 +1,4 @@
-#ifndef __AUTO_SPEED_CONTROL_H__
-#define __AUTO_SPEED_CONTROL_H__
+#pragma once
 
 #include "DasherTypes.h"
 #include "DasherView.h"
@@ -82,4 +81,3 @@ namespace Dasher {
 }
 /// @}
 
-#endif

Src/DasherCore/BasicLog.h

@@ -1,5 +1,4 @@
-#ifndef __BasicLog_h__
-#define __BasicLog_h__
+#pragma once
 
 #include "UserLogBase.h"
 #include "SettingsStore.h"
@@ -45,4 +44,3 @@ class CBasicLog : public CUserLogBase {
 };
 /// @}
 
-#endif

Src/DasherCore/ButtonMode.h

@@ -2,8 +2,7 @@
 // ButtonMode.h 
 // Copyright 2009 by Alan Lawrence
 
-#ifndef __BUTTON_MODE_H__
-#define __BUTTON_MODE_H__
+#pragma once
 
 #include "DasherButtons.h"
 
@@ -34,4 +33,3 @@ class CButtonMode : public CDasherButtons
 }
 /// @}
 
-#endif

Src/DasherCore/ButtonMultiPress.h

@@ -18,8 +18,7 @@
 // along with Dasher; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#ifndef __ButtonMultiPress_h__
-#define __ButtonMultiPress_h__
+#pragma once
 
 #include "DynamicButtons.h"
 
@@ -57,4 +56,3 @@ class CButtonMultiPress : public CDynamicButtons {
  };
 }
 
-#endif

Src/DasherCore/CannaConversionHelper.h

@@ -1,5 +1,4 @@
-#ifndef __CANNA_CONVERSION_HELPER_H__
-#define __CANNA_CONVERSION_HELPER_H__
+#pragma once
 
 #define BUFSIZE 10240
 
@@ -145,4 +144,3 @@ class CCannaConversionHelper : public Dasher::CConversionManager {
 
 };
 /// @}
-#endif

Src/DasherCore/CircleStartHandler.h

@@ -1,5 +1,4 @@
-#ifndef __CIRCLE_START_HANDLER_H__
-#define __CIRCLE_START_HANDLER_H__
+#pragma once
 
 #include "StartHandler.h"
 #include "SettingsStore.h"
@@ -34,4 +33,3 @@ class CCircleStartHandler : public CStartHandler {
 }
 /// @}
 
-#endif

Src/DasherCore/ClickFilter.h

@@ -1,5 +1,4 @@
-#ifndef __CLICK_FILTER_H__
-#define __CLICK_FILTER_H__
+#pragma once
 
 #include <I18n.h>
 
@@ -35,4 +34,3 @@ class CClickFilter : public CStaticFilter, private CZoomAdjuster {
 }
 /// @}
 
-#endif

Src/DasherCore/CompassMode.h

@@ -2,8 +2,7 @@
 // DasherButtons.h
 // Copyright 2005 by Chris Ball
 
-#ifndef __COMPASS_MODE_H__
-#define __COMPASS_MODE_H__
+#pragma once
 
 #include "DasherButtons.h"
 
@@ -30,4 +29,3 @@ class CCompassMode : public CDasherButtons
 }
 /// @}
 
-#endif

Src/DasherCore/ConversionManager.h

@@ -18,8 +18,7 @@
 // along with Dasher; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#ifndef __conversion_manager_h__
-#define __conversion_manager_h__
+#pragma once
 
 #include <map>
 
@@ -226,4 +225,3 @@ namespace Dasher {
   /// @}
 }
 
-#endif