Browse Source

Replaced #pragma once with proper include guards.

Nate Starkey 13 years ago
parent
commit
ec95e6ae16
34 changed files with 131 additions and 63 deletions
  1. 4 2
      Source/Controls/Lua/DataFormatter.h
  2. 4 2
      Source/Controls/Lua/DataSource.h
  3. 4 2
      Source/Controls/Lua/ElementDataGrid.h
  4. 4 2
      Source/Controls/Lua/ElementDataGridRow.h
  5. 3 1
      Source/Controls/Lua/ElementForm.h
  6. 3 2
      Source/Controls/Lua/ElementFormControl.h
  7. 4 2
      Source/Controls/Lua/ElementFormControlDataSelect.h
  8. 4 2
      Source/Controls/Lua/ElementFormControlInput.h
  9. 4 2
      Source/Controls/Lua/ElementFormControlSelect.h
  10. 4 2
      Source/Controls/Lua/ElementFormControlTextArea.h
  11. 4 2
      Source/Controls/Lua/ElementTabSet.h
  12. 4 2
      Source/Controls/Lua/LuaDataFormatter.h
  13. 4 2
      Source/Controls/Lua/LuaDataSource.h
  14. 3 1
      Source/Controls/Lua/SelectOptionsProxy.h
  15. 3 2
      Source/Core/Lua/Colourf.h
  16. 4 2
      Source/Core/Lua/Context.h
  17. 4 2
      Source/Core/Lua/ContextDocumentsProxy.h
  18. 4 2
      Source/Core/Lua/Document.h
  19. 4 2
      Source/Core/Lua/Element.h
  20. 4 2
      Source/Core/Lua/ElementAttributesProxy.h
  21. 4 2
      Source/Core/Lua/ElementStyle.h
  22. 4 2
      Source/Core/Lua/ElementText.h
  23. 4 2
      Source/Core/Lua/Event.h
  24. 4 2
      Source/Core/Lua/EventParametersProxy.h
  25. 4 2
      Source/Core/Lua/LuaDocument.h
  26. 4 2
      Source/Core/Lua/LuaDocumentElementInstancer.h
  27. 4 2
      Source/Core/Lua/LuaEventListener.h
  28. 4 2
      Source/Core/Lua/LuaEventListenerInstancer.h
  29. 4 2
      Source/Core/Lua/Rocket.h
  30. 4 2
      Source/Core/Lua/RocketLua.h
  31. 3 1
      Source/Core/Lua/Utilities.h
  32. 3 1
      Source/Core/Lua/Vector2f.h
  33. 3 1
      Source/Core/Lua/Vector2i.h
  34. 6 2
      Source/Core/Lua/precompiled.h

+ 4 - 2
Source/Controls/Lua/DataFormatter.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUADATAFORMATTER_H
+#define ROCKETCORELUADATAFORMATTER_H
 /*
 /*
     This defines the DataFormatter type in the Lua global namespace
     This defines the DataFormatter type in the Lua global namespace
 
 
@@ -36,4 +37,5 @@ luaL_reg DataFormatterGetters[];
 luaL_reg DataFormatterSetters[];
 luaL_reg DataFormatterSetters[];
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Controls/Lua/DataSource.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUADATASOURCE_H
+#define ROCKETCORELUADATASOURCE_H
 
 
 /*
 /*
     This defines the DataSource type in the Lua global namespace
     This defines the DataSource type in the Lua global namespace
@@ -38,4 +39,5 @@ luaL_reg DataSourceSetters[];
 
 
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Controls/Lua/ElementDataGrid.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAELEMENTDATAGRID_H
+#define ROCKETCORELUAELEMENTDATAGRID_H
 /*
 /*
     This defines the ElementDataGrid type in the Lua global namespace
     This defines the ElementDataGrid type in the Lua global namespace
     
     
@@ -45,4 +46,5 @@ template<> luaL_reg* SetAttrTable<ElementDataGrid>();
 */
 */
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Controls/Lua/ElementDataGridRow.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAELEMENTDATAGRIDROW_H
+#define ROCKETCORELUAELEMENTDATAGRIDROW_H
 /*
 /*
     This defines the ElementDataGridRow type in the Lua global namespace
     This defines the ElementDataGridRow type in the Lua global namespace
 
 
@@ -53,4 +54,5 @@ template<> luaL_reg* SetAttrTable<ElementDataGridRow>();
 
 
 }
 }
 }
 }
-}
+}
+#endif

+ 3 - 1
Source/Controls/Lua/ElementForm.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAELEMENTFORM_H
+#define ROCKETCORELUAELEMENTFORM_H
 /*
 /*
     This defines the ElementForm type in the Lua global namespace
     This defines the ElementForm type in the Lua global namespace
 
 
@@ -38,3 +39,4 @@ template<> luaL_reg* SetAttrTable<ElementForm>() { return ElementFormSetters; }
 }
 }
 }
 }
 }
 }
+#endif

+ 3 - 2
Source/Controls/Lua/ElementFormControl.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAELEMENTFORMCONTROL_H
+#define ROCKETCORELUAELEMENTFORMCONTROL_H
 /*
 /*
     This defines the ElementFormControl type in the Lua global namespace
     This defines the ElementFormControl type in the Lua global namespace
 
 
@@ -42,5 +43,5 @@ template<> luaL_reg* SetAttrTable<ElementFormControl>() { return ElementFormCont
 }
 }
 }
 }
 }
 }
-
+#endif
 
 

+ 4 - 2
Source/Controls/Lua/ElementFormControlDataSelect.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAELEMENTFORMCONTROLDATASELECT_H
+#define ROCKETCORELUAELEMENTFORMCONTROLDATASELECT_H
 /*
 /*
     This defines the ElementFormControlDataSelect type in the Lua global namespace. I think it is the longest
     This defines the ElementFormControlDataSelect type in the Lua global namespace. I think it is the longest
     type name.
     type name.
@@ -38,4 +39,5 @@ template<> luaL_reg* SetAttrTable<ElementFormControlDataSelect>();
 
 
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Controls/Lua/ElementFormControlInput.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAELEMENTFORMCONTROLINPUT_H
+#define ROCKETCORELUAELEMENTFORMCONTROLINPUT_H
 /*
 /*
     This defines the type ElementFormControlInput in the Lua globla namespace, refered to in this documentation by EFCInput
     This defines the type ElementFormControlInput in the Lua globla namespace, refered to in this documentation by EFCInput
 
 
@@ -54,4 +55,5 @@ template<> luaL_reg* SetAttrTable<ElementFormControlInput>();
 
 
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Controls/Lua/ElementFormControlSelect.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAELEMENTFORMCONTROLSELECT_H
+#define ROCKETCORELUAELEMENTFORMCONTROLSELECT_H
 
 
 /*
 /*
     This defines the ElementFormControlSelect type in the Lua global namespace, for this documentation will be
     This defines the ElementFormControlSelect type in the Lua global namespace, for this documentation will be
@@ -55,4 +56,5 @@ template<> luaL_reg* SetAttrTable<ElementFormControlSelect>();
 */
 */
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Controls/Lua/ElementFormControlTextArea.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAELEMENTFORMCONTROLTEXTAREA_H
+#define ROCKETCORELUAELEMENTFORMCONTROLTEXTAREA_H
 /*
 /*
     This defines the ElementFormControlTextArea type in the Lua global namespace, refered in this documentation by EFCTextArea
     This defines the ElementFormControlTextArea type in the Lua global namespace, refered in this documentation by EFCTextArea
 
 
@@ -46,4 +47,5 @@ template<> luaL_reg* SetAttrTable<ElementFormControlTextArea>();
 */
 */
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Controls/Lua/ElementTabSet.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAELEMENTTABSET_H
+#define ROCKETCORELUAELEMENTTABSET_H
 /*
 /*
     This defines the ElementTabSet type in the Lua global namespace
     This defines the ElementTabSet type in the Lua global namespace
 
 
@@ -51,4 +52,5 @@ template<> luaL_reg* SetAttrTable<ElementTabSet>();
 */
 */
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Controls/Lua/LuaDataFormatter.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUALUADATAFORMATTER_H
+#define ROCKETCORELUALUADATAFORMATTER_H
 #include <Rocket/Core/Lua/lua.hpp>
 #include <Rocket/Core/Lua/lua.hpp>
 #include <Rocket/Controls/DataFormatter.h>
 #include <Rocket/Controls/DataFormatter.h>
 
 
@@ -23,4 +24,5 @@ public:
 
 
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Controls/Lua/LuaDataSource.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUALUADATASOURCE_H
+#define ROCKETCORELUALUADATASOURCE_H
 
 
 #include <Rocket/Core/Lua/LuaType.h>
 #include <Rocket/Core/Lua/LuaType.h>
 #include <Rocket/Core/Lua/lua.hpp>
 #include <Rocket/Core/Lua/lua.hpp>
@@ -39,4 +40,5 @@ public:
 
 
 }
 }
 }
 }
-}
+}
+#endif

+ 3 - 1
Source/Controls/Lua/SelectOptionsProxy.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUASELECTOPTIONSPROXY_H
+#define ROCKETCORELUASELECTOPTIONSPROXY_H
 /*
 /*
     Proxy table for ElementFormControlSelect.options
     Proxy table for ElementFormControlSelect.options
     read-only, key must be a number
     read-only, key must be a number
@@ -35,3 +36,4 @@ luaL_reg SelectOptionsProxySetters[];
 }
 }
 }
 }
 }
 }
+#endif

+ 3 - 2
Source/Core/Lua/Colourf.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUACOLOURF_H
+#define ROCKETCORELUACOLOURF_H
 /*
 /*
     Declares Colourf in the Lua global namespace. It implements the below (examples using Lua syntax) :
     Declares Colourf in the Lua global namespace. It implements the below (examples using Lua syntax) :
 
 
@@ -62,5 +63,5 @@ template<> luaL_reg* SetAttrTable<Colourf>() { return ColourfSetters; }
 }
 }
 }
 }
 }
 }
-
+#endif
 
 

+ 4 - 2
Source/Core/Lua/Context.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUACONTEXT_H
+#define ROCKETCORELUACONTEXT_H
 /*
 /*
     This defines a Context type in the Lua global namespace
     This defines a Context type in the Lua global namespace
 
 
@@ -84,4 +85,5 @@ template<> luaL_reg* SetAttrTable<Context>();
 */
 */
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/ContextDocumentsProxy.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUACONTEXTDOCUMENTSPROXY_H
+#define ROCKETCORELUACONTEXTDOCUMENTSPROXY_H
 /*
 /*
     A proxy table with key of string and int and a value of Document
     A proxy table with key of string and int and a value of Document
     Read only
     Read only
@@ -24,4 +25,5 @@ luaL_reg ContextDocumentsProxyGetters[];
 luaL_reg ContextDocumentsProxySetters[];
 luaL_reg ContextDocumentsProxySetters[];
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/Document.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUADOCUMENT_H
+#define ROCKETCORELUADOCUMENT_H
 /*
 /*
     This defines the Document type in the Lua global namespace
     This defines the Document type in the Lua global namespace
 
 
@@ -63,4 +64,5 @@ template<> luaL_reg* SetAttrTable<Document>();
 */
 */
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/Element.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAELEMENT_H
+#define ROCKETCORELUAELEMENT_H
 /*
 /*
     This defines the Element type in the Lua global namespace
     This defines the Element type in the Lua global namespace
 
 
@@ -174,4 +175,5 @@ template<> luaL_reg* SetAttrTable<Element>();
 */
 */
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/ElementAttributesProxy.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAELEMENTATTRIBUTESPROXY_H
+#define ROCKETCORELUAELEMENTATTRIBUTESPROXY_H
 /*
 /*
     Proxy table for Element.attribues
     Proxy table for Element.attribues
     read-only Dictionary
     read-only Dictionary
@@ -24,4 +25,5 @@ luaL_reg ElementAttributesProxyGetters[];
 luaL_reg ElementAttributesProxySetters[];
 luaL_reg ElementAttributesProxySetters[];
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/ElementStyle.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAELEMENTSTYLE_H
+#define ROCKETCORELUAELEMENTSTYLE_H
 /*
 /*
     This is the definition of an ElementStyle Lua object
     This is the definition of an ElementStyle Lua object
 
 
@@ -65,4 +66,5 @@ template<> luaL_reg* SetAttrTable<ElementStyle>();
 */
 */
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/ElementText.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAELEMENTTEXT_H
+#define ROCKETCORELUAELEMENTTEXT_H
 #include <Rocket/Core/Lua/lua.hpp>
 #include <Rocket/Core/Lua/lua.hpp>
 #include <Rocket/Core/Lua/LuaType.h>
 #include <Rocket/Core/Lua/LuaType.h>
 #include <Rocket/Core/ElementText.h>
 #include <Rocket/Core/ElementText.h>
@@ -19,4 +20,5 @@ luaL_reg ElementTextSetters[];
 
 
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/Event.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAEVENT_H
+#define ROCKETCORELUAEVENT_H
 /*
 /*
     This defines an Event type name in the global Lua namespace
     This defines an Event type name in the global Lua namespace
 
 
@@ -43,4 +44,5 @@ template<> luaL_reg* SetAttrTable<Event>();
 */
 */
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/EventParametersProxy.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAEVENTPARAMETERSPROXY_H
+#define ROCKETCORELUAEVENTPARAMETERSPROXY_H
 /*
 /*
     Proxy table for Event.parameters
     Proxy table for Event.parameters
     read-only Dictionary
     read-only Dictionary
@@ -24,4 +25,5 @@ luaL_reg EventParametersProxyGetters[];
 luaL_reg EventParametersProxySetters[];
 luaL_reg EventParametersProxySetters[];
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/LuaDocument.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUALUADOCUMENT_H
+#define ROCKETCORELUALUADOCUMENT_H
 /*
 /*
     This class is an ElementDocument that overrides the LoadScript function
     This class is an ElementDocument that overrides the LoadScript function
 */
 */
@@ -17,4 +18,5 @@ public:
 
 
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/LuaDocumentElementInstancer.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUALUADOCUMENTELEMENTINSTANCER_H
+#define ROCKETCORELUALUADOCUMENTELEMENTINSTANCER_H
 
 
 #include <Rocket/Core/ElementInstancer.h>
 #include <Rocket/Core/ElementInstancer.h>
 
 
@@ -22,4 +23,5 @@ class LuaDocumentElementInstancer : public ElementInstancer
 
 
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/LuaEventListener.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUALUAEVENTLISTENER_H
+#define ROCKETCORELUALUAEVENTLISTENER_H
 #include <Rocket/Core/EventListener.h>
 #include <Rocket/Core/EventListener.h>
 #include <Rocket/Core/String.h>
 #include <Rocket/Core/String.h>
 #include <Rocket/Core/Lua/lua.hpp>
 #include <Rocket/Core/Lua/lua.hpp>
@@ -34,4 +35,5 @@ private:
 
 
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/LuaEventListenerInstancer.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUALUAEVENTLISTENERINSTANCER_H
+#define ROCKETCORELUALUAEVENTLISTENERINSTANCER_H
 #include <Rocket/Core/EventListenerInstancer.h>
 #include <Rocket/Core/EventListenerInstancer.h>
 
 
 namespace Rocket {
 namespace Rocket {
@@ -19,4 +20,5 @@ public:
 
 
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/Rocket.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAROCKET_H
+#define ROCKETCORELUAROCKET_H
 
 
 /*
 /*
     This declares rocket in the global Lua namespace
     This declares rocket in the global Lua namespace
@@ -46,4 +47,5 @@ template<> luaL_reg* SetAttrTable<rocket>();
 */
 */
 }
 }
 }
 }
-}
+}
+#endif

+ 4 - 2
Source/Core/Lua/RocketLua.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAROCKETLUA_H
+#define ROCKETCORELUAROCKETLUA_H
 
 
 #include "Header.h"
 #include "Header.h"
 
 
@@ -9,4 +10,5 @@ namespace Lua {
 void ROCKETLUA_API Initialise();
 void ROCKETLUA_API Initialise();
 }
 }
 }
 }
-}
+}
+#endif

+ 3 - 1
Source/Core/Lua/Utilities.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAUTILITIES_H
+#define ROCKETCORELUAUTILITIES_H
 /*
 /*
     This file is for free-floating functions that are used across more than one file.
     This file is for free-floating functions that are used across more than one file.
 */
 */
@@ -16,3 +17,4 @@ void PushVariant(lua_State* L, Variant* var);
 }
 }
 }
 }
 }
 }
+#endif

+ 3 - 1
Source/Core/Lua/Vector2f.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAVECTOR2F_H
+#define ROCKETCORELUAVECTOR2F_H
 /*
 /*
     Declares Vector2f in the Lua global namespace. It implements the below (examples using Lua syntax) :
     Declares Vector2f in the Lua global namespace. It implements the below (examples using Lua syntax) :
 
 
@@ -67,3 +68,4 @@ template<> luaL_reg* SetAttrTable<Vector2f>() { return Vector2fSetters; }
 }
 }
 }
 }
 }
 }
+#endif

+ 3 - 1
Source/Core/Lua/Vector2i.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef ROCKETCORELUAVECTOR2I_H
+#define ROCKETCORELUAVECTOR2I_H
 /*
 /*
     Declares Vector2i in the Lua global namespace. It implements the below (examples using Lua syntax) :
     Declares Vector2i in the Lua global namespace. It implements the below (examples using Lua syntax) :
 
 
@@ -58,4 +59,5 @@ template<> luaL_reg* SetAttrTable<Vector2i>() { return Vector2iSetters; }
 }
 }
 }
 }
 }
 }
+#endif
 
 

+ 6 - 2
Source/Core/Lua/precompiled.h

@@ -1,5 +1,9 @@
-#pragma once
+#ifndef ROCKETCORELUAPRECOMPILED_H
+#define ROCKETCORELUAPRECOMPILED_H
+
 #include <Rocket/Core/Core.h>
 #include <Rocket/Core/Core.h>
 #include <Rocket/Core/Debug.h>
 #include <Rocket/Core/Debug.h>
 #include <Rocket/Controls/Controls.h>
 #include <Rocket/Controls/Controls.h>
-#include <Rocket/Core/Lua/LuaType.h>
+#include <Rocket/Core/Lua/LuaType.h>
+
+#endif