Merge pull request #7 from PapeCoding/fix/include_guards

Fixing include guards and transitioning to using pragma once

Author: PapeCoding

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