From 22b7a41c2e6888b76fef393c948a20cd18121b3a Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sun, 27 Mar 2011 23:31:39 +0000 Subject: [PATCH] core: fix include guard naming scheme. --- src/audio.h | 6 +++--- src/bitfield.h | 6 +++--- src/core.h | 6 +++--- src/debugfps.h | 6 +++--- src/debugquad.h | 6 +++--- src/debugrecord.h | 6 +++--- src/debugsphere.h | 6 +++--- src/debugstats.h | 6 +++--- src/dict.h | 6 +++--- src/eglapp.h | 6 +++--- src/emitter.h | 6 +++--- src/entity.h | 6 +++--- src/font.h | 6 +++--- src/forge.h | 6 +++--- src/hash.h | 6 +++--- src/image.h | 6 +++--- src/input.h | 6 +++--- src/layer.h | 6 +++--- src/log.h | 6 +++--- src/loldebug.h | 6 +++--- src/lolgl.h | 6 +++--- src/map.h | 6 +++--- src/matrix.h | 6 +++--- src/numeric.h | 6 +++--- src/profiler.h | 6 +++--- src/sample.h | 6 +++--- src/sampler.h | 6 +++--- src/scene.h | 6 +++--- src/sdlapp.h | 6 +++--- src/sdlinput.h | 6 +++--- src/shader.h | 6 +++--- src/text.h | 6 +++--- src/ticker.h | 6 +++--- src/tiler.h | 6 +++--- src/tileset.h | 6 +++--- src/timer.h | 6 +++--- src/video.h | 6 +++--- src/world.h | 6 +++--- src/worldentity.h | 6 +++--- 39 files changed, 117 insertions(+), 117 deletions(-) diff --git a/src/audio.h b/src/audio.h index 9083d8fd..7cf98db1 100644 --- a/src/audio.h +++ b/src/audio.h @@ -14,8 +14,8 @@ // Helper functions to set up the audio device. // -#if !defined __DH_AUDIO_H__ -#define __DH_AUDIO_H__ +#if !defined __LOL_AUDIO_H__ +#define __LOL_AUDIO_H__ #include @@ -30,5 +30,5 @@ public: } /* namespace lol */ -#endif // __DH_AUDIO_H__ +#endif // __LOL_AUDIO_H__ diff --git a/src/bitfield.h b/src/bitfield.h index 46a124a9..4838e551 100644 --- a/src/bitfield.h +++ b/src/bitfield.h @@ -13,8 +13,8 @@ // ------------------ // -#if !defined __DH_BITFIELD_H__ -#define __DH_BITFIELD_H__ +#if !defined __LOL_BITFIELD_H__ +#define __LOL_BITFIELD_H__ #include @@ -51,5 +51,5 @@ private: } /* namespace lol */ -#endif // __DH_BITFIELD_H__ +#endif // __LOL_BITFIELD_H__ diff --git a/src/core.h b/src/core.h index 1e70d391..8cd578bf 100644 --- a/src/core.h +++ b/src/core.h @@ -13,8 +13,8 @@ // --------------- // -#if !defined __DH_CORE_H__ -#define __DH_CORE_H__ +#if !defined __LOL_CORE_H__ +#define __LOL_CORE_H__ // Base types #include "matrix.h" @@ -53,5 +53,5 @@ #include "tiler.h" #include "sampler.h" -#endif // __DH_CORE_H__ +#endif // __LOL_CORE_H__ diff --git a/src/debugfps.h b/src/debugfps.h index e04019f5..98238f18 100644 --- a/src/debugfps.h +++ b/src/debugfps.h @@ -13,8 +13,8 @@ // ------------------ // -#if !defined __DH_DEBUGFPS_H__ -#define __DH_DEBUGFPS_H__ +#if !defined __LOL_DEBUGFPS_H__ +#define __LOL_DEBUGFPS_H__ #include "entity.h" @@ -38,5 +38,5 @@ private: } /* namespace lol */ -#endif // __DH_DEBUGFPS_H__ +#endif // __LOL_DEBUGFPS_H__ diff --git a/src/debugquad.h b/src/debugquad.h index c26a1232..5db4f5be 100644 --- a/src/debugquad.h +++ b/src/debugquad.h @@ -13,8 +13,8 @@ // ------------------- // -#if !defined __DH_DEBUGTRI_H__ -#define __DH_DEBUGTRI_H__ +#if !defined __LOL_DEBUGTRI_H__ +#define __LOL_DEBUGTRI_H__ #include "entity.h" @@ -39,5 +39,5 @@ private: } /* namespace lol */ -#endif // __DH_DEBUGTRI_H__ +#endif // __LOL_DEBUGTRI_H__ diff --git a/src/debugrecord.h b/src/debugrecord.h index 35f585a4..d5ee9fe8 100644 --- a/src/debugrecord.h +++ b/src/debugrecord.h @@ -13,8 +13,8 @@ // --------------------- // -#if !defined __DH_DEBUGRECORD_H__ -#define __DH_DEBUGRECORD_H__ +#if !defined __LOL_DEBUGRECORD_H__ +#define __LOL_DEBUGRECORD_H__ #include "entity.h" @@ -39,5 +39,5 @@ private: } /* namespace lol */ -#endif // __DH_DEBUGRECORD_H__ +#endif // __LOL_DEBUGRECORD_H__ diff --git a/src/debugsphere.h b/src/debugsphere.h index 27c54ab8..726ffec8 100644 --- a/src/debugsphere.h +++ b/src/debugsphere.h @@ -13,8 +13,8 @@ // --------------------- // -#if !defined __DH_DEBUGSPHERE_H__ -#define __DH_DEBUGSPHERE_H__ +#if !defined __LOL_DEBUGSPHERE_H__ +#define __LOL_DEBUGSPHERE_H__ #include "entity.h" @@ -39,5 +39,5 @@ private: } /* namespace lol */ -#endif // __DH_DEBUGSPHERE_H__ +#endif // __LOL_DEBUGSPHERE_H__ diff --git a/src/debugstats.h b/src/debugstats.h index 45b48be6..8512f126 100644 --- a/src/debugstats.h +++ b/src/debugstats.h @@ -13,8 +13,8 @@ // -------------------- // -#if !defined __DH_DEBUGSTATS_H__ -#define __DH_DEBUGSTATS_H__ +#if !defined __LOL_DEBUGSTATS_H__ +#define __LOL_DEBUGSTATS_H__ #include "entity.h" @@ -38,5 +38,5 @@ private: } /* namespace lol */ -#endif // __DH_DEBUGSTATS_H__ +#endif // __LOL_DEBUGSTATS_H__ diff --git a/src/dict.h b/src/dict.h index ea2b6c3a..3c94b3e1 100644 --- a/src/dict.h +++ b/src/dict.h @@ -13,8 +13,8 @@ // -------------- // -#if !defined __DH_DICT_H__ -#define __DH_DICT_H__ +#if !defined __LOL_DICT_H__ +#define __LOL_DICT_H__ #include "entity.h" @@ -41,5 +41,5 @@ private: } /* namespace lol */ -#endif // __DH_DICT_H__ +#endif // __LOL_DICT_H__ diff --git a/src/eglapp.h b/src/eglapp.h index d3de30e7..f279a824 100644 --- a/src/eglapp.h +++ b/src/eglapp.h @@ -13,8 +13,8 @@ // ---------------- // -#if !defined __DH_EGLAPP_H__ -#define __DH_EGLAPP_H__ +#if !defined __LOL_EGLAPP_H__ +#define __LOL_EGLAPP_H__ #include "matrix.h" @@ -37,5 +37,5 @@ private: } /* namespace lol */ -#endif // __DH_EGLAPP_H__ +#endif // __LOL_EGLAPP_H__ diff --git a/src/emitter.h b/src/emitter.h index df443420..587118a7 100644 --- a/src/emitter.h +++ b/src/emitter.h @@ -13,8 +13,8 @@ // ----------------- // -#if !defined __DH_EMITTER_H__ -#define __DH_EMITTER_H__ +#if !defined __LOL_EMITTER_H__ +#define __LOL_EMITTER_H__ #include "entity.h" @@ -41,5 +41,5 @@ private: } /* namespace lol */ -#endif // __DH_EMITTER_H__ +#endif // __LOL_EMITTER_H__ diff --git a/src/entity.h b/src/entity.h index f0f7cdb9..bb50cbd0 100644 --- a/src/entity.h +++ b/src/entity.h @@ -16,8 +16,8 @@ // Ticker class for the ticking logic and the linked list implementation. // -#if !defined __DH_ENTITY_H__ -#define __DH_ENTITY_H__ +#if !defined __LOL_ENTITY_H__ +#define __LOL_ENTITY_H__ #include @@ -84,5 +84,5 @@ private: } /* namespace lol */ -#endif // __DH_ENTITY_H__ +#endif // __LOL_ENTITY_H__ diff --git a/src/font.h b/src/font.h index fac5abfe..db2df2e5 100644 --- a/src/font.h +++ b/src/font.h @@ -13,8 +13,8 @@ // -------------- // -#if !defined __DH_FONT_H__ -#define __DH_FONT_H__ +#if !defined __LOL_FONT_H__ +#define __LOL_FONT_H__ #include "entity.h" @@ -45,5 +45,5 @@ private: } /* namespace lol */ -#endif // __DH_FONT_H__ +#endif // __LOL_FONT_H__ diff --git a/src/forge.h b/src/forge.h index 5a06271d..a3b817dd 100644 --- a/src/forge.h +++ b/src/forge.h @@ -14,8 +14,8 @@ // The Forge is a static class that manages fonts. // -#if !defined __DH_FORGE_H__ -#define __DH_FORGE_H__ +#if !defined __LOL_FORGE_H__ +#define __LOL_FORGE_H__ #include "font.h" @@ -32,5 +32,5 @@ public: } /* namespace lol */ -#endif // __DH_FORGE_H__ +#endif // __LOL_FORGE_H__ diff --git a/src/hash.h b/src/hash.h index 6798b038..1ae54cad 100644 --- a/src/hash.h +++ b/src/hash.h @@ -13,8 +13,8 @@ // -------------- // -#if !defined __DH_HASH_H__ -#define __DH_HASH_H__ +#if !defined __LOL_HASH_H__ +#define __LOL_HASH_H__ namespace lol { @@ -27,5 +27,5 @@ public: } /* namespace lol */ -#endif // __DH_HASH_H__ +#endif // __LOL_HASH_H__ diff --git a/src/image.h b/src/image.h index 3ea00c6c..1e51df1f 100644 --- a/src/image.h +++ b/src/image.h @@ -13,8 +13,8 @@ // --------------- // -#if !defined __DH_IMAGE_H__ -#define __DH_IMAGE_H__ +#if !defined __LOL_IMAGE_H__ +#define __LOL_IMAGE_H__ #include "matrix.h" @@ -47,5 +47,5 @@ private: } /* namespace lol */ -#endif // __DH_IMAGE_H__ +#endif // __LOL_IMAGE_H__ diff --git a/src/input.h b/src/input.h index bf754462..06bc59fd 100644 --- a/src/input.h +++ b/src/input.h @@ -13,8 +13,8 @@ // ---------------------- // -#if !defined __DH_INPUT_H__ -#define __DH_INPUT_H__ +#if !defined __LOL_INPUT_H__ +#define __LOL_INPUT_H__ #include "matrix.h" @@ -43,5 +43,5 @@ public: } /* namespace lol */ -#endif // __DH_INPUT_H__ +#endif // __LOL_INPUT_H__ diff --git a/src/layer.h b/src/layer.h index 1609a8dc..dce89a75 100644 --- a/src/layer.h +++ b/src/layer.h @@ -14,8 +14,8 @@ // A Layer object is a subset of a Map. // -#if !defined __DH_LAYER_H__ -#define __DH_LAYER_H__ +#if !defined __LOL_LAYER_H__ +#define __LOL_LAYER_H__ #include @@ -39,5 +39,5 @@ private: } /* namespace lol */ -#endif // __DH_LAYER_H__ +#endif // __LOL_LAYER_H__ diff --git a/src/log.h b/src/log.h index cffa93d8..5d528529 100644 --- a/src/log.h +++ b/src/log.h @@ -14,8 +14,8 @@ // The central logging system. // -#if !defined __DH_LOG_H__ -#define __DH_LOG_H__ +#if !defined __LOL_LOG_H__ +#define __LOL_LOG_H__ #include @@ -37,5 +37,5 @@ public: } /* namespace lol */ -#endif // __DH_LOG_H__ +#endif // __LOL_LOG_H__ diff --git a/src/loldebug.h b/src/loldebug.h index 5f5eb65f..b8f22e2a 100644 --- a/src/loldebug.h +++ b/src/loldebug.h @@ -13,8 +13,8 @@ // -------------------- // -#if !defined __DH_LOLDEBUG_H__ -#define __DH_LOLDEBUG_H__ +#if !defined __LOL_LOLDEBUG_H__ +#define __LOL_LOLDEBUG_H__ #include "debugfps.h" #include "debugquad.h" @@ -22,5 +22,5 @@ #include "debugsphere.h" #include "debugstats.h" -#endif // __DH_LOLDEBUG_H__ +#endif // __LOL_LOLDEBUG_H__ diff --git a/src/lolgl.h b/src/lolgl.h index 61de7d2a..c3d8616f 100644 --- a/src/lolgl.h +++ b/src/lolgl.h @@ -13,8 +13,8 @@ // -------------- // -#if !defined __DH_LOLGL_H__ -#define __DH_LOLGL_H__ +#if !defined __LOL_LOLGL_H__ +#define __LOL_LOLGL_H__ #define GL_GLEXT_PROTOTYPES @@ -50,5 +50,5 @@ # define glBindVertexArray glBindVertexArrayOES #endif -#endif // __DH_LOLGL_H__ +#endif // __LOL_LOLGL_H__ diff --git a/src/map.h b/src/map.h index 5df1dacb..b42ebf4a 100644 --- a/src/map.h +++ b/src/map.h @@ -15,8 +15,8 @@ // determined later). // -#if !defined __DH_MAP_H__ -#define __DH_MAP_H__ +#if !defined __LOL_MAP_H__ +#define __LOL_MAP_H__ namespace lol { @@ -39,5 +39,5 @@ private: } /* namespace lol */ -#endif // __DH_MAP_H__ +#endif // __LOL_MAP_H__ diff --git a/src/matrix.h b/src/matrix.h index 69accb43..72c1e650 100644 --- a/src/matrix.h +++ b/src/matrix.h @@ -13,8 +13,8 @@ // ------------------ // -#if !defined __DH_MATRIX_H__ -#define __DH_MATRIX_H__ +#if !defined __LOL_MATRIX_H__ +#define __LOL_MATRIX_H__ #include @@ -285,5 +285,5 @@ typedef Mat4 mat4i; } /* namespace lol */ -#endif // __DH_MATRIX_H__ +#endif // __LOL_MATRIX_H__ diff --git a/src/numeric.h b/src/numeric.h index 9b196cdd..870480ab 100644 --- a/src/numeric.h +++ b/src/numeric.h @@ -13,8 +13,8 @@ // ------------------ // -#if !defined __DH_NUMERIC_H__ -#define __DH_NUMERIC_H__ +#if !defined __LOL_NUMERIC_H__ +#define __LOL_NUMERIC_H__ #include #include @@ -54,5 +54,5 @@ template static inline T PotUp(T val) } /* namespace lol */ -#endif // __DH_NUMERIC_H__ +#endif // __LOL_NUMERIC_H__ diff --git a/src/profiler.h b/src/profiler.h index 120b3fd8..ee462858 100644 --- a/src/profiler.h +++ b/src/profiler.h @@ -14,8 +14,8 @@ // The Profiler is a static class that collects statistic counters. // -#if !defined __DH_PROFILER_H__ -#define __DH_PROFILER_H__ +#if !defined __LOL_PROFILER_H__ +#define __LOL_PROFILER_H__ #include @@ -52,5 +52,5 @@ public: } /* namespace lol */ -#endif // __DH_PROFILER_H__ +#endif // __LOL_PROFILER_H__ diff --git a/src/sample.h b/src/sample.h index f18fad52..12eb4d9e 100644 --- a/src/sample.h +++ b/src/sample.h @@ -14,8 +14,8 @@ // A Sample is a unique sound sample. // -#if !defined __DH_SAMPLE_H__ -#define __DH_SAMPLE_H__ +#if !defined __LOL_SAMPLE_H__ +#define __LOL_SAMPLE_H__ #include @@ -47,5 +47,5 @@ private: } /* namespace lol */ -#endif // __DH_SAMPLE_H__ +#endif // __LOL_SAMPLE_H__ diff --git a/src/sampler.h b/src/sampler.h index 3a3af979..6164a016 100644 --- a/src/sampler.h +++ b/src/sampler.h @@ -14,8 +14,8 @@ // The Sampler is a static class that manages samples. // -#if !defined __DH_SAMPLER_H__ -#define __DH_SAMPLER_H__ +#if !defined __LOL_SAMPLER_H__ +#define __LOL_SAMPLER_H__ #include @@ -33,5 +33,5 @@ public: } /* namespace lol */ -#endif // __DH_SAMPLER_H__ +#endif // __LOL_SAMPLER_H__ diff --git a/src/scene.h b/src/scene.h index 923ad4cc..04aeae5d 100644 --- a/src/scene.h +++ b/src/scene.h @@ -13,8 +13,8 @@ // --------------- // -#if !defined __DH_SCENE_H__ -#define __DH_SCENE_H__ +#if !defined __LOL_SCENE_H__ +#define __LOL_SCENE_H__ #include @@ -41,5 +41,5 @@ private: } /* namespace lol */ -#endif // __DH_SCENE_H__ +#endif // __LOL_SCENE_H__ diff --git a/src/sdlapp.h b/src/sdlapp.h index 4b45dbd0..de7091a7 100644 --- a/src/sdlapp.h +++ b/src/sdlapp.h @@ -13,8 +13,8 @@ // ---------------- // -#if !defined __DH_SDLAPP_H__ -#define __DH_SDLAPP_H__ +#if !defined __LOL_SDLAPP_H__ +#define __LOL_SDLAPP_H__ #include "matrix.h" @@ -37,5 +37,5 @@ private: } /* namespace lol */ -#endif // __DH_SDLAPP_H__ +#endif // __LOL_SDLAPP_H__ diff --git a/src/sdlinput.h b/src/sdlinput.h index 11ce916b..b2ff8b72 100644 --- a/src/sdlinput.h +++ b/src/sdlinput.h @@ -13,8 +13,8 @@ // ------------------ // -#if !defined __DH_SDLINPUT_H__ -#define __DH_SDLINPUT_H__ +#if !defined __LOL_SDLINPUT_H__ +#define __LOL_SDLINPUT_H__ #include "entity.h" @@ -38,5 +38,5 @@ private: } /* namespace lol */ -#endif // __DH_SDLINPUT_H__ +#endif // __LOL_SDLINPUT_H__ diff --git a/src/shader.h b/src/shader.h index 24887d2c..4a46b1c7 100644 --- a/src/shader.h +++ b/src/shader.h @@ -13,8 +13,8 @@ // ---------------- // -#if !defined __DH_SHADER_H__ -#define __DH_SHADER_H__ +#if !defined __LOL_SHADER_H__ +#define __LOL_SHADER_H__ namespace lol { @@ -42,5 +42,5 @@ private: } /* namespace lol */ -#endif // __DH_SHADER_H__ +#endif // __LOL_SHADER_H__ diff --git a/src/text.h b/src/text.h index bea8f0bf..fc700cc0 100644 --- a/src/text.h +++ b/src/text.h @@ -13,8 +13,8 @@ // -------------- // -#if !defined __DH_TEXT_H__ -#define __DH_TEXT_H__ +#if !defined __LOL_TEXT_H__ +#define __LOL_TEXT_H__ #include "entity.h" @@ -50,5 +50,5 @@ private: } /* namespace lol */ -#endif // __DH_TEXT_H__ +#endif // __LOL_TEXT_H__ diff --git a/src/ticker.h b/src/ticker.h index c0a8b7af..7811d502 100644 --- a/src/ticker.h +++ b/src/ticker.h @@ -14,8 +14,8 @@ // The Ticker is a static class that registers entities and ticks them. // -#if !defined __DH_TICKER_H__ -#define __DH_TICKER_H__ +#if !defined __LOL_TICKER_H__ +#define __LOL_TICKER_H__ #include @@ -47,5 +47,5 @@ public: } /* namespace lol */ -#endif // __DH_TICKER_H__ +#endif // __LOL_TICKER_H__ diff --git a/src/tiler.h b/src/tiler.h index 61be67ce..d9ccab13 100644 --- a/src/tiler.h +++ b/src/tiler.h @@ -14,8 +14,8 @@ // The Tiler is a static class that manages tilesets. // -#if !defined __DH_TILER_H__ -#define __DH_TILER_H__ +#if !defined __LOL_TILER_H__ +#define __LOL_TILER_H__ #include @@ -38,5 +38,5 @@ public: } /* namespace lol */ -#endif // __DH_TILER_H__ +#endif // __LOL_TILER_H__ diff --git a/src/tileset.h b/src/tileset.h index f41e585c..5ccd10e5 100644 --- a/src/tileset.h +++ b/src/tileset.h @@ -16,8 +16,8 @@ // zero, the texture is freed. // -#if !defined __DH_TILESET_H__ -#define __DH_TILESET_H__ +#if !defined __LOL_TILESET_H__ +#define __LOL_TILESET_H__ #include @@ -53,5 +53,5 @@ private: } /* namespace lol */ -#endif // __DH_TILESET_H__ +#endif // __LOL_TILESET_H__ diff --git a/src/timer.h b/src/timer.h index c53933ee..f8f96cb2 100644 --- a/src/timer.h +++ b/src/timer.h @@ -13,8 +13,8 @@ // --------------- // -#if !defined __DH_TIMER_H__ -#define __DH_TIMER_H__ +#if !defined __LOL_TIMER_H__ +#define __LOL_TIMER_H__ namespace lol { @@ -37,5 +37,5 @@ private: } /* namespace lol */ -#endif // __DH_TIMER_H__ +#endif // __LOL_TIMER_H__ diff --git a/src/video.h b/src/video.h index 3d65c208..77401edb 100644 --- a/src/video.h +++ b/src/video.h @@ -14,8 +14,8 @@ // Helper GL functions to set up the scene. // -#if !defined __DH_VIDEO_H__ -#define __DH_VIDEO_H__ +#if !defined __LOL_VIDEO_H__ +#define __LOL_VIDEO_H__ #include @@ -37,5 +37,5 @@ public: } /* namespace lol */ -#endif // __DH_VIDEO_H__ +#endif // __LOL_VIDEO_H__ diff --git a/src/world.h b/src/world.h index aa63fe44..343ec072 100644 --- a/src/world.h +++ b/src/world.h @@ -13,8 +13,8 @@ // --------------- // -#if !defined __DH_WORLD_H__ -#define __DH_WORLD_H__ +#if !defined __LOL_WORLD_H__ +#define __LOL_WORLD_H__ #include "entity.h" @@ -46,5 +46,5 @@ private: } /* namespace lol */ -#endif // __DH_WORLD_H__ +#endif // __LOL_WORLD_H__ diff --git a/src/worldentity.h b/src/worldentity.h index 5927fd75..9791b7fe 100644 --- a/src/worldentity.h +++ b/src/worldentity.h @@ -13,8 +13,8 @@ // ----------------------- // -#if !defined __DH_WORLDENTITY_H__ -#define __DH_WORLDENTITY_H__ +#if !defined __LOL_WORLDENTITY_H__ +#define __LOL_WORLDENTITY_H__ #include "entity.h" @@ -45,5 +45,5 @@ protected: } /* namespace lol */ -#endif // __DH_WORLDENTITY_H__ +#endif // __LOL_WORLDENTITY_H__