Use pragma once for headers

obsidian-level-maker · Jun 10, 2024 · 87c86b0 · 87c86b0
1 parent 35fb5bd
commit 87c86b0
Show file tree

Hide file tree

Showing 49 changed files with 52 additions and 234 deletions.
diff --git a/source/bsp.h b/source/bsp.h
@@ -18,8 +18,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef __AJBSP_BSP_H__
-#define __AJBSP_BSP_H__
+#pragma once
 
 #include <string>
 
@@ -136,7 +135,5 @@ build_result_e BuildLevel(int lev_idx);
 
 } // namespace ajbsp
 
-#endif /* __AJBSP_BSP_H__ */
-
 //--- editor settings ---
 // vi:ts=4:sw=4:noexpandtab
diff --git a/source/bsp_local.h b/source/bsp_local.h
@@ -18,8 +18,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef __AJBSP_LOCAL_H__
-#define __AJBSP_LOCAL_H__
+#pragma once
 
 #include <vector>
 
@@ -625,7 +624,5 @@ void RoundOffBspTree();
 
 } // namespace ajbsp
 
-#endif /* __AJBSP_LOCAL_H__ */
-
 //--- editor settings ---
 // vi:ts=4:sw=4:noexpandtab
diff --git a/source/bsp_utility.h b/source/bsp_utility.h
@@ -17,8 +17,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef __AJBSP_UTILITY_H__
-#define __AJBSP_UTILITY_H__
+#pragma once
 
 namespace ajbsp
 {
@@ -34,7 +33,5 @@ double ComputeAngle(double dx, double dy);
 
 } // namespace ajbsp
 
-#endif /* __AJBSP_UTILITY_H__ */
-
 //--- editor settings ---
 // vi:ts=4:sw=4:noexpandtab
diff --git a/source/bsp_wad.h b/source/bsp_wad.h
@@ -16,8 +16,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef __AJBSP_WAD_H__
-#define __AJBSP_WAD_H__
+#pragma once
 
 #include <vector>
 
@@ -327,7 +326,5 @@ class Wad_file
 
 } // namespace ajbsp
 
-#endif /* __AJBSP_WAD_H__ */
-
 //--- editor settings ---
 // vi:ts=4:sw=4:noexpandtab
diff --git a/source/csg_doom.cc b/source/csg_doom.cc
@@ -24,7 +24,6 @@
 
 #include "csg_local.h"
 #include "csg_main.h"
-#include "dm_extra.h"
 #include "g_doom.h"
 #ifndef CONSOLE_ONLY
 #include "hdr_fltk.h"

diff --git a/source/csg_local.h b/source/csg_local.h
@@ -19,8 +19,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef __OBLIGE_CSG_LOCAL_H__
-#define __OBLIGE_CSG_LOCAL_H__
+#pragma once
 
 #include <vector>
 
@@ -231,7 +230,5 @@ region_c *CSG_PointInRegion(double x, double y);
 
 void CSG_Shade();
 
-#endif /* __OBLIGE_CSG_LOCAL_H__ */
-
 //--- editor settings ---
 // vi:ts=4:sw=4:noexpandtab
diff --git a/source/csg_main.h b/source/csg_main.h
@@ -19,8 +19,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef __OBLIGE_CSG_MAIN_H__
-#define __OBLIGE_CSG_MAIN_H__
+#pragma once
 
 #include <stdint.h>
 
@@ -277,7 +276,5 @@ csg_property_set_c *CSG_LookupTexProps(std::string name);
 
 void CSG_LinkBrushToEntity(csg_brush_c *B, std::string link_key);
 
-#endif /* __OBLIGE_CSG_MAIN_H__ */
-
 //--- editor settings ---
 // vi:ts=4:sw=4:noexpandtab
diff --git a/source/dm_extra.cc b/source/dm_extra.cc
@@ -19,8 +19,6 @@
 //
 //------------------------------------------------------------------------
 
-#include "dm_extra.h"
-
 #include "csg_main.h"
 #include "g_doom.h"
 #ifndef CONSOLE_ONLY

diff --git a/source/dm_extra.h b/source/dm_extra.h
diff --git a/source/dm_prefab.cc b/source/dm_prefab.cc
@@ -58,8 +58,6 @@
 //
 //------------------------------------------------------------------------
 
-#include "dm_prefab.h"
-
 #include "csg_main.h"
 #include "g_doom.h"
 #include "poly.h"

diff --git a/source/dm_prefab.h b/source/dm_prefab.h
diff --git a/source/g_doom.h b/source/g_doom.h
@@ -19,8 +19,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef G_DOOM_H_
-#define G_DOOM_H_
+#pragma once
 
 #include "m_lua.h"
 
@@ -290,7 +289,5 @@ struct raw_subsec_t
 
 } // namespace Doom
 
-#endif // G_DOOM_H_
-
 //--- editor settings ---
 // vi:ts=4:sw=4:noexpandtab
diff --git a/source/hdr_fltk.h b/source/hdr_fltk.h
@@ -19,8 +19,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef __OB_HDR_FLTK__
-#define __OB_HDR_FLTK__
+#pragma once
 
 /* FLTK - Widget Library */
 
@@ -69,6 +68,4 @@
 #include <FL/filename.H>
 #include <FL/fl_ask.H>
 #include <FL/fl_draw.H>
-#include <FL/platform.H>
-
-#endif // __OB_HDR_FLTK__
+#include <FL/platform.H>
diff --git a/source/hdr_lua.h b/source/hdr_lua.h
@@ -19,11 +19,8 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef __OB_HDR_LUA__
-#define __OB_HDR_LUA__
+#pragma once
 
 /* LUA Scripting Language */
 
-#include "../../libraries/minilua/minilua.h"
-
-#endif // __OB_HDR_LUA__
+#include "../../libraries/minilua/minilua.h"
diff --git a/source/hdr_ui.h b/source/hdr_ui.h
@@ -19,8 +19,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef __OB_HDR_UI_H__
-#define __OB_HDR_UI_H__
+#pragma once
 
 #include "ui_boxes.h"
 #include "ui_build.h"
@@ -29,6 +28,4 @@
 #include "ui_map.h"
 #include "ui_module.h"
 #include "ui_widgets.h"
-#include "ui_window.h"
-
-#endif /* __OB_HDR_UI_H__ */
+#include "ui_window.h"
diff --git a/source/headers.h b/source/headers.h
@@ -19,8 +19,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef __OBLIGE_INCLUDES_H__
-#define __OBLIGE_INCLUDES_H__
+#pragma once
 
 // we C++
 #ifdef NULL
@@ -76,7 +75,5 @@
 
 const char *ob_gettext(const char *s);
 
-#endif /* __OBLIGE_INCLUDES_H__ */
-
 //--- editor settings ---
 // vi:ts=4:sw=4:noexpandtab
diff --git a/source/images.h b/source/images.h
@@ -1,7 +1,6 @@
 // Various internal images used by Obsidian
 
-#ifndef __OBSIDIAN_LOGOS_H__
-#define __OBSIDIAN_LOGOS_H__
+#pragma once
 
 #include "headers.h"
 
@@ -5262,6 +5261,4 @@ const uint8_t image_data_RELIEF[64 * 64] = {
     31,  17,  17,  17,  20,  20,  20,  20,  20,  20,  20,  17,  20,  20,  20,  20,  20,  20,  17,  17,  20,  20,  20,
     20,  20};
 
-const logo_image_t logo_RELIEF = {"RELIEF", 64, 64, image_data_RELIEF};
-
-#endif /* __OBSIDIAN_LOGOS_H__ */
+const logo_image_t logo_RELIEF = {"RELIEF", 64, 64, image_data_RELIEF};
diff --git a/source/lib_argv.h b/source/lib_argv.h
@@ -19,8 +19,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef LIB_ARGV_H_
-#define LIB_ARGV_H_
+#pragma once
 
 #include <string>
 #include <unordered_set>
@@ -40,7 +39,5 @@ bool IsOption(int index);
 
 } // namespace argv
 
-#endif /* __LIB_ARGV_H__ */
-
 //--- editor settings ---
 // vi:ts=4:sw=4:noexpandtab
diff --git a/source/lib_parse.h b/source/lib_parse.h
@@ -16,8 +16,7 @@
 //
 //----------------------------------------------------------------------------
 
-#ifndef __AJ_PARSE_H__
-#define __AJ_PARSE_H__
+#pragma once
 
 #include <string>
 
@@ -87,7 +86,5 @@ bool   LEX_Boolean(const std::string &s);
 
 } // namespace ajparse
 
-#endif /* __AJ_PARSE_H__ */
-
 //--- editor settings ---
 // vi:ts=4:sw=4:noexpandtab
diff --git a/source/lib_tga.h b/source/lib_tga.h
@@ -19,8 +19,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef __OBLIGE_TGA_LOADER_H__
-#define __OBLIGE_TGA_LOADER_H__
+#pragma once
 
 // this layout is compatible with Fl_Color (except for alpha)
 typedef unsigned int rgb_color_t;
@@ -58,7 +57,5 @@ class tga_image_c
 
 tga_image_c *TGA_LoadImage(const char *path);
 
-#endif /* __OBLIGE_TGA_LOADER_H__ */
-
 //--- editor settings ---
 // vi:ts=4:sw=4:noexpandtab
diff --git a/source/lib_util.h b/source/lib_util.h
@@ -19,8 +19,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef __LIB_UTIL_H__
-#define __LIB_UTIL_H__
+#pragma once
 
 #include <stdint.h>
 
@@ -156,7 +155,5 @@ std::pair<double, double> AlongCoord(double along, double px1, double py1, doubl
 
 bool VectorSameDir(double dx1, double dy1, double dx2, double dy2);
 
-#endif /* __LIB_UTIL_H__ */
-
 //--- editor settings ---
 // vi:ts=4:sw=4:noexpandtab
diff --git a/source/lib_wad.h b/source/lib_wad.h
@@ -19,8 +19,7 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef LIB_WAD_H_
-#define LIB_WAD_H_
+#pragma once
 
 /* WAD reading */
 
@@ -69,7 +68,5 @@ struct raw_wad_lump_t
 };
 #pragma pack(pop)
 
-#endif
-
 //--- editor settings ---
 // vi:ts=4:sw=4:noexpandtab