Merge pull request #784 from BenjamenMeyer/enhancement_header_guard_u…

…pdates Enhancement: Uniform Header Guards
vegastrike · Jun 9, 2023 · 989621b · 989621b
2 parents 32ea757 + e37deb1
commit 989621b
Show file tree

Hide file tree

Showing 463 changed files with 1,969 additions and 2,451 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ ext/
 packages/
 *.log
 *.bak
+*.sw?
 *.kdev4
 .vs/
 .vscode/

diff --git a/engine/cmake-config.h.in b/engine/cmake-config.h.in
@@ -3,7 +3,7 @@
 *
 * Copyright (c) 2001-2002 Daniel Horn
 * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors
-* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors
+* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors
 *
 * https://github.com/vegastrike/Vega-Strike-Engine-Source
 *

diff --git a/engine/launcher/general.h b/engine/launcher/general.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d,
- * Stephen G. Tuggy, and other Vega Strike contributors.
+ * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
  *
@@ -28,8 +28,8 @@
 // Mar 05, 2002: Fixed the FindFiles() so it now checks sub directories
 // Mar 05, 2002: Fixed FindFiles() again
 
-#ifndef GENERAL_H
-#define GENERAL_H
+#ifndef VEGA_STRIKE_LAUNCHER_GENERAL_H
+#define VEGA_STRIKE_LAUNCHER_GENERAL_H
 
 /* Don't forget, these defines can be set at compile time with the compile flag -D */
 
@@ -177,4 +177,4 @@ glob_t *FindFiles(char *path, char *extension);
 glob_t *FindDirs(char *path);
 #endif    // _G_PATH
 
-#endif    // GENERAL_H
+#endif    // VEGA_STRIKE_LAUNCHER_GENERAL_H
diff --git a/engine/launcher/resource.h b/engine/launcher/resource.h
@@ -3,7 +3,7 @@
 *
 * Copyright (c) 2001-2002 Daniel Horn
 * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors
-* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors
+* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors
 *
 * https://github.com/vegastrike/Vega-Strike-Engine-Source
 *

diff --git a/engine/mission/include/central.h b/engine/mission/include/central.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d, Stephen G. Tuggy,
+ * Copyright (C) 2001-2023 Daniel Horn, David Ranger, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer,
  * and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
@@ -19,10 +19,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
-
-// Check to see if we're already loaded
-#ifndef CENTRAL_H
-#define CENTRAL_H
+#ifndef VEGA_STRIKE_ENGINE_MISSION_CENTRAL_H
+#define VEGA_STRIKE_ENGINE_MISSION_CENTRAL_H
 
 #define MISSION_VERSION "1.0.0.1"
 #define MISSION_PROGRAM "Vega Strike"
@@ -67,4 +65,4 @@ struct mission_data {
 extern glob_t *MISSIONS;
 extern struct mission_data DATA;
 
-#endif    //CENTRAL_H
+#endif //VEGA_STRIKE_ENGINE_MISSION_CENTRAL_H
diff --git a/engine/mission/include/display_gtk.h b/engine/mission/include/display_gtk.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d, Stephen G. Tuggy,
+ * Copyright (C) 2001-2023 Daniel Horn, David Ranger, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer,
  * and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
@@ -19,10 +19,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
-
-// Check to see if we're already loaded
-#ifndef DISPLAY_GTK_H
-#define DISPLAY_GTK_H
+#ifndef VEGA_STRIKE_ENGINE_MISSION_DISPLAY_GTK_H
+#define VEGA_STRIKE_ENGINE_MISSION_DISPLAY_GTK_H
 
 #include "central.h"
 
@@ -41,4 +39,4 @@ void cb_unselect_child(GtkWidget *root_tree, GtkWidget *child, GtkWidget *subtre
 void cb_select_child(GtkWidget *root_tree, GtkWidget *child, GtkWidget *subtree);
 void cb_selection_changed(GtkWidget *tree);
 
-#endif    //DISPLAY_GTK_H
+#endif //VEGA_STRIKE_ENGINE_MISSION_DISPLAY_GTK_H
diff --git a/engine/mission/include/easydom.h b/engine/mission/include/easydom.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Roy Falk,
- * Stephen G. Tuggy, and other Vega Strike contributors.
+ * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Roy Falk,
+ * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
  *
@@ -24,8 +24,8 @@
   easyDom - easy DOM for expat - written by Alexander Rawass <[email protected]>
 */
 
-#ifndef _EASYDOM_H_
-#define _EASYDOM_H_
+#ifndef VEGA_STRIKE_ENGINE_MISSION_EASYDOM_H
+#define VEGA_STRIKE_ENGINE_MISSION_EASYDOM_H
 
 #include <expat.h>
 #include <string>
@@ -260,4 +260,4 @@ class easyDomFactory {
     domNodeType *topnode;
 };
 
-#endif // _EASYDOM_H_
+#endif //VEGA_STRIKE_ENGINE_MISSION_EASYDOM_H
diff --git a/engine/mission/include/file.h b/engine/mission/include/file.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d,
- * Stephen G. Tuggy, and other Vega Strike contributors.
+ * Copyright (C) 2001-2023 Daniel Horn, David Ranger, pyramid3d,
+ * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
  *
@@ -19,10 +19,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
-
-// Check to see if we're already loaded
-#ifndef FILE_H
-#define FILE_H
+#ifndef VEGA_STRIKE_ENGINE_MISSION_FILE_H
+#define VEGA_STRIKE_ENGINE_MISSION_FILE_H
 
 #include "central.h"
 #include "easydom.h"
@@ -77,4 +75,4 @@ class missionNode : public tagDomNode {
     struct script_t script;
 };
 
-#endif
+#endif //VEGA_STRIKE_ENGINE_MISSION_FILE_H
diff --git a/engine/mission/include/general.h b/engine/mission/include/general.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d,
- * Stephen G. Tuggy, and other Vega Strike contributors.
+ * Copyright (C) 2001-2023 Daniel Horn, David Ranger, pyramid3d,
+ * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
  *
@@ -19,11 +19,9 @@
  * You should have received a copy of the GNU General Public License
  * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
-
 // Version 2.2
-
-#ifndef GENERAL_H
-#define GENERAL_H
+#ifndef VEGA_STRIKE_ENGINE_MISSION_GENERAL_H
+#define VEGA_STRIKE_ENGINE_MISSION_GENERAL_H
 
 /* Don't forget, these defines can be set at compile time with the compile flag -D */
 
@@ -154,4 +152,4 @@ glob_t *FindFiles(char *path, char *extension);
 glob_t *FindDirs(char *path);
 #endif    // _G_GLOB
 
-#endif    // GENERAL_H
+#endif // VEGA_STRIKE_ENGINE_MISSION_GENERAL_H
diff --git a/engine/mission/include/hashtable.h b/engine/mission/include/hashtable.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, Alan Shieh, pyramid3d,
- * Stephen G. Tuggy, and other Vega Strike contributors.
+ * Copyright (C) 2001-2023 Daniel Horn, Alan Shieh, pyramid3d,
+ * Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
  *
@@ -19,9 +19,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
-
-#ifndef _HASHTABLE_H_
-#define _HASHTABLE_H_
+#ifndef VEGA_STRIKE_ENGINE_MISSION_HASHTABLE_H
+#define VEGA_STRIKE_ENGINE_MISSION_HASHTABLE_H
 
 #include <math.h>
 #include <list>
@@ -111,5 +110,4 @@ class Hashtable {
 */
 };
 
-#endif
-
+#endif //VEGA_STRIKE_ENGINE_MISSION_HASHTABLE_H
diff --git a/engine/mission/include/xml_support.h b/engine/mission/include/xml_support.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer,
  * and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
@@ -19,10 +19,9 @@
  * You should have received a copy of the GNU General Public License
  * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
+#ifndef VEGA_STRIKE_ENGINE_MISSION_XML_SUPPORT_H
+#define VEGA_STRIKE_ENGINE_MISSION_XML_SUPPORT_H
 
-#ifndef _XML_SUPPORT_H_
-
-#define _XML_SUPPORT_H_
 #include <stdio.h>
 #include <string>
 #ifndef WIN32
@@ -106,4 +105,5 @@ string inline tostring(float num) {
   }
 #endif*/
 }
-#endif
+
+#endif //VEGA_STRIKE_ENGINE_MISSION_XML_SUPPORT_H
diff --git a/engine/objconv/basemaker/base_maker_texture.h b/engine/objconv/basemaker/base_maker_texture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer,
  * and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
@@ -19,6 +19,7 @@
  * You should have received a copy of the GNU General Public License
  * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
+// NO HEADER GUARD
 
 ///A single OpenGL texture
 #include "gldrv/gl_globals.h"

diff --git a/engine/objconv/basemaker/sprite.h b/engine/objconv/basemaker/sprite.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer,
  * and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
@@ -19,9 +19,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
-
-#ifndef SPRITE_H
-#define SPRITE_H
+#ifndef VEGA_STRIKE_ENGINE_OBJCONV_SPRITE_H
+#define VEGA_STRIKE_ENGINE_OBJCONV_SPRITE_H
 
 #include "gfx/quaternion.h"
 #include "gfx/vec.h"
@@ -80,4 +79,4 @@ class VSSprite {
     }
 };
 
-#endif
+#endif //VEGA_STRIKE_ENGINE_OBJCONV_SPRITE_H
diff --git a/engine/objconv/mesher/Converter.h b/engine/objconv/mesher/Converter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer,
  * and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
@@ -19,9 +19,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
-
-#ifndef __CONVERTER_API__INCLUDED__
-#define __CONVERTER_API__INCLUDED__
+#ifndef VEGA_STRIKE_ENGINE_OBJCONV_CONVERTER_H
+#define VEGA_STRIKE_ENGINE_OBJCONV_CONVERTER_H
 
 namespace Converter {
 typedef std::vector<std::string> ParameterList;
@@ -209,5 +208,4 @@ class ConversionImplDeclaration {
 };
 }
 
-#endif //__CONVERTER_API__INCLUDED__
-
+#endif //VEGA_STRIKE_ENGINE_OBJCONV_CONVERTER_H
diff --git a/engine/objconv/mesher/PrecompiledHeaders/Converter.h b/engine/objconv/mesher/PrecompiledHeaders/Converter.h
@@ -3,7 +3,7 @@
 *
 * Copyright (c) 2001-2002 Daniel Horn
 * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors
-* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors
+* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors
 *
 * https://github.com/vegastrike/Vega-Strike-Engine-Source
 *
@@ -22,6 +22,7 @@
 * You should have received a copy of the GNU General Public License
 * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
 */
+// NO HEADER GUARD
 
 #ifdef HAVE_OGRE
 #include <OgrePrerequisites.h>

diff --git a/engine/objconv/mesher/PrecompiledHeaders/Standard.h b/engine/objconv/mesher/PrecompiledHeaders/Standard.h
@@ -3,7 +3,7 @@
 *
 * Copyright (c) 2001-2002 Daniel Horn
 * Copyright (c) 2002-2019 pyramid3d and other Vega Strike Contributors
-* Copyright (c) 2019-2021 Stephen G. Tuggy, and other Vega Strike Contributors
+* Copyright (c) 2019-2023 Stephen G. Tuggy, Benjamen R. Meyer, and other Vega Strike Contributors
 *
 * https://github.com/vegastrike/Vega-Strike-Engine-Source
 *
@@ -22,9 +22,8 @@
 * You should have received a copy of the GNU General Public License
 * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
 */
-
-#ifndef __PRECOMPILED_STANDARD_INCLUDED__
-#define __PRECOMPILED_STANDARD_INCLUDED__
+#ifndef VEGA_STRIKE_ENGINE_OBJCONV_PRECOMPILED_STANDARD_H
+#define VEGA_STRIKE_ENGINE_OBJCONV_PRECOMPILED_STANDARD_H
 
 #include <string>
 #include <vector>
@@ -35,5 +34,4 @@
 #include <iostream>
 #include <iomanip>
 
-#endif//__PRECOMPILED_STANDARD_INCLUDED__
-
+#endif //VEGA_STRIKE_ENGINE_OBJCONV_PRECOMPILED_STANDARD_H
diff --git a/engine/objconv/mesher/expat.h b/engine/objconv/mesher/expat.h
@@ -1,7 +1,9 @@
 /*
  *  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+ *  Copyright (c) 2023 Benjamen R. Meyer
  *  See the file COPYING for copying permission.
  */
+// NO HEADER GUARD -- 3rd Party
 
 #ifndef XmlParse_INCLUDED
 #define XmlParse_INCLUDED 1

diff --git a/engine/objconv/mesher/from_BFXM.h b/engine/objconv/mesher/from_BFXM.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer,
  * and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
@@ -19,6 +19,7 @@
  * You should have received a copy of the GNU General Public License
  * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
+// NO HEADER GUARD
 
 #include <string>
 #include <vector>

diff --git a/engine/objconv/mesher/from_obj.h b/engine/objconv/mesher/from_obj.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer,
  * and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
@@ -19,6 +19,7 @@
  * You should have received a copy of the GNU General Public License
  * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
+// NO HEADER GUARD
 
 #include "mesh_io.h"
 #include "to_BFXM.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ ext/ @@
     packages/
     *.log
     *.bak
+    *.sw?
     *.kdev4
     .vs/
     .vscode/
@@ Expand Down @@