Add missing pragma once (#1120)

TheAssemblyArmada · Feb 21, 2024 · b013231 · b013231
1 parent 64626cd
commit b013231
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 20 deletions.
diff --git a/src/game/client/draw/tintenvelope.h b/src/game/client/draw/tintenvelope.h
@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
 
 #include "always.h"
 #include "mempoolobj.h"

diff --git a/src/game/client/gui/challengegenerals.h b/src/game/client/gui/challengegenerals.h
@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
 
 #include "always.h"
 #include "asciistring.h"

diff --git a/src/game/client/w3dassetmanager.h b/src/game/client/w3dassetmanager.h
@@ -12,6 +12,8 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
+
 #include "asciistring.h"
 #include "assetmgr.h"
 #include "mempoolobj.h"

diff --git a/src/game/common/mapobject.h b/src/game/common/mapobject.h
@@ -12,6 +12,8 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
+
 #include "always.h"
 #include "asciistring.h"
 #include "coord.h"

diff --git a/src/game/common/rts/productionprerequisite.h b/src/game/common/rts/productionprerequisite.h
@@ -14,9 +14,6 @@
  */
 #pragma once
 
-#ifndef PRODUCTIONPREREQUISITE_H
-#define PRODUCTIONPREREQUISITE_H
-
 #include "always.h"
 #include "asciistring.h"
 #include "science.h"
@@ -58,5 +55,3 @@ class ProductionPrerequisite
     std::vector<PrereqUnitRec> m_prereqUnit;
     std::vector<ScienceType> m_prereqScience;
 };
-
-#endif // PRODUCTIONPREREQUISITE_H
diff --git a/src/game/common/thing/thingtemplate.h b/src/game/common/thing/thingtemplate.h
@@ -14,9 +14,6 @@
  */
 #pragma once
 
-#ifndef THINGTEMPLATE_H
-#define THINGTEMPLATE_H
-
 #include "always.h"
 #include "armortemplateset.h"
 #include "asciistring.h"
@@ -421,5 +418,3 @@ class ThingTemplate : public Overridable
     static const FieldParse s_objectFieldParseTable[];
     static const FieldParse s_objectReskinFieldParseTable[];
 };
-
-#endif // THINGTEMPLATE_H
diff --git a/src/game/logic/object/armortemplateset.h b/src/game/logic/object/armortemplateset.h
@@ -14,9 +14,6 @@
  */
 #pragma once
 
-#ifndef ARMORTEMPLATESET_H
-#define ARMORTEMPLATESET_H
-
 #include "always.h"
 #include "bitflags.h"
 #include "ini.h"
@@ -54,5 +51,3 @@ class ArmorTemplateSet
     ArmorTemplate *m_template;
     DamageFX *m_fx;
 };
-
-#endif // ARMORTEMPLATESET_H
diff --git a/src/game/logic/object/objectcreationlist.h b/src/game/logic/object/objectcreationlist.h
@@ -12,6 +12,7 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
 
 #include "mempoolobj.h"
 #include "namekeygenerator.h"

diff --git a/src/game/logic/object/weapontemplateset.h b/src/game/logic/object/weapontemplateset.h
@@ -14,9 +14,6 @@
  */
 #pragma once
 
-#ifndef WEAPONTEMPLATESET_H
-#define WEAPONTEMPLATESET_H
-
 #include "always.h"
 #include "bitflags.h"
 #include "gametype.h"
@@ -82,5 +79,3 @@ class WeaponTemplateSet
     bool m_shareWeaponReloadTime;
     bool m_weaponLockSharedAcrossSets;
 };
-
-#endif // WEAPONTEMPLATESET_H
diff --git a/src/tools/w3dviewer/colorutils.h b/src/tools/w3dviewer/colorutils.h
@@ -12,7 +12,10 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
+
 #include "w3dafx.h"
+
 void DrawSunkenRect(BYTE *bits, RECT *rect, int stride);
 void DrawRaisedRect(BYTE *bits, RECT *rect, int stride);
 void DrawOutlinedRect(BYTE *bits, RECT *rect, int color, int stride);
diff --git a/src/tools/w3dviewer/emitterlinegroupproppage.h b/src/tools/w3dviewer/emitterlinegroupproppage.h
@@ -12,6 +12,8 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
+
 #include "w3dafx.h"
 #include "part_emt.h"
 

diff --git a/src/tools/w3dviewer/emitterlineproppage.h b/src/tools/w3dviewer/emitterlineproppage.h
@@ -12,6 +12,8 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
+
 #include "w3dafx.h"
 
 class EmitterInstanceList;

diff --git a/src/tools/w3dviewer/emitterparticleproppage.h b/src/tools/w3dviewer/emitterparticleproppage.h
@@ -12,6 +12,8 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
+
 #include "w3dafx.h"
 
 class EmitterInstanceList;

diff --git a/src/tools/w3dviewer/emitterphysicsproppage.h b/src/tools/w3dviewer/emitterphysicsproppage.h
@@ -12,6 +12,8 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
+
 #include "w3dafx.h"
 #include "vector3.h"
 

diff --git a/src/tools/w3dviewer/emitterrotationproppage.h b/src/tools/w3dviewer/emitterrotationproppage.h
@@ -12,6 +12,8 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
+
 #include "w3dafx.h"
 #include "part_emt.h"
 

diff --git a/src/tools/w3dviewer/emittersizeproppage.h b/src/tools/w3dviewer/emittersizeproppage.h
@@ -12,6 +12,8 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
+
 #include "w3dafx.h"
 #include "part_emt.h"
 

diff --git a/src/tools/w3dviewer/emitteruserproppage.h b/src/tools/w3dviewer/emitteruserproppage.h
@@ -12,6 +12,8 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
+
 #include "w3dafx.h"
 
 class EmitterInstanceList;

diff --git a/src/w3d/lib/slist.h b/src/w3d/lib/slist.h
@@ -12,8 +12,11 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
+
 #include "always.h"
 #include "autopool.h"
+
 template<typename T> class SList;
 
 class GenericSLNode : public AutoPoolClass<GenericSLNode, 256>

diff --git a/src/w3d/renderer/line3d.h b/src/w3d/renderer/line3d.h
@@ -12,6 +12,8 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
+#pragma once
+
 #include "always.h"
 #include "rendobj.h"
 #include "shader.h"