summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-05-28 14:53:44 +0300
committerAndrei Karas <akaras@inbox.ru>2013-05-28 20:29:17 +0300
commit45d9715a4657a7369c394c2ca114847056a12a7c (patch)
treecb25d84a9d9af84c50486138a47782cf488f527d
parentfe189f61b6385a30c689b46667ccc18c7117056a (diff)
downloadmv-45d9715a4657a7369c394c2ca114847056a12a7c.tar.gz
mv-45d9715a4657a7369c394c2ca114847056a12a7c.tar.bz2
mv-45d9715a4657a7369c394c2ca114847056a12a7c.tar.xz
mv-45d9715a4657a7369c394c2ca114847056a12a7c.zip
fix guard header part3.
-rw-r--r--src/actionmanager.h2
-rw-r--r--src/animatedsprite.h2
-rw-r--r--src/animationparticle.h6
-rw-r--r--src/being.h2
-rw-r--r--src/beingcacheentry.h2
-rw-r--r--src/beingequipbackend.h2
-rw-r--r--src/chatlogger.h6
-rw-r--r--src/configlistener.h2
-rw-r--r--src/configuration.h2
-rw-r--r--src/defaults.h2
-rw-r--r--src/depricatedevent.h6
-rw-r--r--src/depricatedlistener.h2
-rw-r--r--src/dropshortcut.h2
-rw-r--r--src/effectmanager.h6
-rw-r--r--src/emoteshortcut.h2
-rw-r--r--src/equipment.h2
-rw-r--r--src/flooritem.h2
-rw-r--r--src/game.h2
-rw-r--r--src/graphics.h2
-rw-r--r--src/graphicsmanager.h2
-rw-r--r--src/imageparticle.h2
-rw-r--r--src/inputevent.h2
-rw-r--r--src/inputmanager.h2
-rw-r--r--src/inventory.h2
-rw-r--r--src/item.h2
-rw-r--r--src/itemshortcut.h2
-rw-r--r--src/keyboardconfig.h2
-rw-r--r--src/keyboarddata.h2
-rw-r--r--src/keydata.h2
-rw-r--r--src/keyevent.h2
-rw-r--r--src/keyinput.h2
-rw-r--r--src/localplayer.h2
-rw-r--r--src/logger.h6
-rw-r--r--src/main.h2
-rw-r--r--src/map.h2
-rw-r--r--src/maplayer.h2
-rw-r--r--src/mgl.h2
-rw-r--r--src/mobileopenglgraphics.h2
-rw-r--r--src/mouseinput.h2
-rw-r--r--src/mumblemanager.h4
-rw-r--r--src/navigationmanager.h2
-rw-r--r--src/normalopenglgraphics.h2
-rw-r--r--src/notifications.h6
-rw-r--r--src/notifymanager.h3
-rw-r--r--src/nullopenglgraphics.h2
-rw-r--r--src/particle.h2
-rw-r--r--src/particlecontainer.h6
-rw-r--r--src/particleemitter.h2
-rw-r--r--src/particleemitterprop.h5
-rw-r--r--src/playerinfo.h2
-rw-r--r--src/playerrelations.h6
-rw-r--r--src/properties.h2
-rw-r--r--src/resources/action.h6
-rw-r--r--src/resources/ambientlayer.h6
-rw-r--r--src/resources/animation.h6
-rw-r--r--src/resources/atlasmanager.h8
-rw-r--r--src/resources/avatardb.h6
-rw-r--r--src/resources/beinginfo.h6
-rw-r--r--src/resources/chardb.h6
-rw-r--r--src/resources/colordb.h6
-rw-r--r--src/resources/cursor.h6
-rw-r--r--src/resources/dye.h6
-rw-r--r--src/resources/dyecolor.h6
-rw-r--r--src/resources/emotedb.h6
-rw-r--r--src/resources/fboinfo.h8
-rw-r--r--src/resources/image.h6
-rw-r--r--src/resources/imagehelper.h6
-rw-r--r--src/resources/imageset.h6
-rw-r--r--src/resources/imagewriter.h5
-rw-r--r--src/resources/itemdb.h6
-rw-r--r--src/resources/iteminfo.h6
-rw-r--r--src/resources/mapdb.h6
-rw-r--r--src/resources/mapreader.h6
-rw-r--r--src/resources/monsterdb.h6
-rw-r--r--src/resources/npcdb.h6
-rw-r--r--src/resources/openglimagehelper.h6
-rw-r--r--src/resources/palettedb.h6
-rw-r--r--src/resources/petdb.h6
-rw-r--r--src/resources/resource.h6
-rw-r--r--src/resources/resourcemanager.h6
-rw-r--r--src/resources/sdlimagehelper.h6
-rw-r--r--src/resources/sdlmusic.h6
-rw-r--r--src/resources/sounddb.h6
-rw-r--r--src/resources/soundeffect.h6
-rw-r--r--src/resources/soundinfo.h6
-rw-r--r--src/resources/spritedef.h6
-rw-r--r--src/resources/subimage.h6
-rw-r--r--src/resources/wallpaper.h6
-rw-r--r--src/rotationalparticle.h6
-rw-r--r--src/safeopenglgraphics.h2
-rw-r--r--src/shopitem.h6
-rw-r--r--src/simpleanimation.h6
-rw-r--r--src/soundmanager.h2
-rw-r--r--src/spellshortcut.h2
-rw-r--r--src/statuseffect.h6
-rw-r--r--src/textcommand.h2
-rw-r--r--src/textparticle.h2
-rw-r--r--src/tileset.h2
-rw-r--r--src/touchactions.h2
-rw-r--r--src/touchmanager.h4
-rw-r--r--src/utils/base64.h6
-rw-r--r--src/utils/copynpaste.h5
-rw-r--r--src/utils/dtor.h2
-rw-r--r--src/utils/mkdir.h6
-rw-r--r--src/utils/mutex.h6
-rw-r--r--src/utils/perfomance.h6
-rw-r--r--src/utils/physfsrwops.h4
-rw-r--r--src/utils/physfstools.h6
-rw-r--r--src/utils/specialfolder.h6
-rw-r--r--src/utils/stringvector.h6
-rw-r--r--src/utils/translation/translationmanager.h6
-rw-r--r--src/utils/xml.h6
-rw-r--r--src/variabledata.h2
-rw-r--r--src/walklayer.h2
114 files changed, 244 insertions, 228 deletions
diff --git a/src/actionmanager.h b/src/actionmanager.h
index 765abbaf2..bc0335b07 100644
--- a/src/actionmanager.h
+++ b/src/actionmanager.h
@@ -124,4 +124,4 @@ namespace ActionManager
#undef decHandler
-#endif
+#endif // ACTIONMANAGER_H
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index a742a8f25..5a7dbde56 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -129,4 +129,4 @@ class AnimatedSprite final : public Sprite
static bool mEnableCache;
};
-#endif
+#endif // ANIMATEDSPRITE_H
diff --git a/src/animationparticle.h b/src/animationparticle.h
index feb1db3de..02c383fea 100644
--- a/src/animationparticle.h
+++ b/src/animationparticle.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ANIMATION_PARTICLE_H
-#define ANIMATION_PARTICLE_H
+#ifndef ANIMATIONPARTICLE_H
+#define ANIMATIONPARTICLE_H
#include "imageparticle.h"
@@ -49,4 +49,4 @@ class AnimationParticle final : public ImageParticle
SimpleAnimation *mAnimation; /**< Used animation for this particle */
};
-#endif
+#endif // ANIMATIONPARTICLE_H
diff --git a/src/being.h b/src/being.h
index bc5089dcc..6911f830b 100644
--- a/src/being.h
+++ b/src/being.h
@@ -1047,4 +1047,4 @@ class Being : public ActorSprite, public ConfigListener
extern std::list<BeingCacheEntry*> beingInfoCache;
-#endif
+#endif // BEING_H
diff --git a/src/beingcacheentry.h b/src/beingcacheentry.h
index 7fe7dd943..fb050ddd4 100644
--- a/src/beingcacheentry.h
+++ b/src/beingcacheentry.h
@@ -125,4 +125,4 @@ class BeingCacheEntry final
int mFlags;
};
-#endif
+#endif // BEINGCACHEENTRY_H
diff --git a/src/beingequipbackend.h b/src/beingequipbackend.h
index f13029b13..8d2c6dbcc 100644
--- a/src/beingequipbackend.h
+++ b/src/beingequipbackend.h
@@ -47,4 +47,4 @@ class BeingEquipBackend final : public Equipment::Backend
Being *mBeing;
};
-#endif
+#endif // BEINGEQUIPBACKEND_H
diff --git a/src/chatlogger.h b/src/chatlogger.h
index a502d7ad1..9eff21094 100644
--- a/src/chatlogger.h
+++ b/src/chatlogger.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef M_CHATLOGGER_H
-#define M_CHATLOGGER_H
+#ifndef CHATLOGGER_H
+#define CHATLOGGER_H
#include <fstream>
#include <list>
@@ -83,4 +83,4 @@ class ChatLogger final
extern ChatLogger *chatLogger;
-#endif
+#endif // CHATLOGGER_H
diff --git a/src/configlistener.h b/src/configlistener.h
index ee41fb381..47d4897b0 100644
--- a/src/configlistener.h
+++ b/src/configlistener.h
@@ -47,4 +47,4 @@ class ConfigListener
virtual void optionChanged(const std::string &name) = 0;
};
-#endif
+#endif // CONFIGLISTENER_H
diff --git a/src/configuration.h b/src/configuration.h
index cffbab84e..f2215147b 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -363,4 +363,4 @@ extern Configuration serverConfig;
extern Configuration paths;
extern Configuration features;
-#endif
+#endif // CONFIGURATION_H
diff --git a/src/defaults.h b/src/defaults.h
index 4cfddf00f..73d0a703a 100644
--- a/src/defaults.h
+++ b/src/defaults.h
@@ -43,4 +43,4 @@ DefaultsData* getBrandingDefaults() A_WARN_UNUSED;
DefaultsData* getPathsDefaults() A_WARN_UNUSED;
DefaultsData* getFeaturesDefaults() A_WARN_UNUSED;
-#endif
+#endif // DEFAULTS_H
diff --git a/src/depricatedevent.h b/src/depricatedevent.h
index 1c31cea57..5ae4c85f3 100644
--- a/src/depricatedevent.h
+++ b/src/depricatedevent.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef DEPRICATED_EVENT_H
-#define DEPRICATED_EVENT_H
+#ifndef DEPRICATEDEVENT_H
+#define DEPRICATEDEVENT_H
#include <map>
#include <set>
@@ -101,4 +101,4 @@ class DepricatedEvent final
VariableMap mData;
};
-#endif
+#endif // DEPRICATEDEVENT_H
diff --git a/src/depricatedlistener.h b/src/depricatedlistener.h
index 3914cac25..06d957eb5 100644
--- a/src/depricatedlistener.h
+++ b/src/depricatedlistener.h
@@ -39,4 +39,4 @@ class DepricatedListener
const DepricatedEvent &event) = 0;
};
-#endif
+#endif // DEPRICATEDLISTENER_H
diff --git a/src/dropshortcut.h b/src/dropshortcut.h
index b94a3c7a3..a15fd423d 100644
--- a/src/dropshortcut.h
+++ b/src/dropshortcut.h
@@ -164,4 +164,4 @@ class DropShortcut final
extern DropShortcut *dropShortcut;
-#endif
+#endif // DROPSHORTCUT_H
diff --git a/src/effectmanager.h b/src/effectmanager.h
index 9e3b2258d..fd600e3b2 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EFFECT_MANAGER_H
-#define EFFECT_MANAGER_H
+#ifndef EFFECTMANAGER_H
+#define EFFECTMANAGER_H
#include <list>
#include <string>
@@ -80,4 +80,4 @@ class EffectManager final
extern EffectManager *effectManager;
-#endif // EFFECT_MANAGER_H
+#endif // EFFECTMANAGER_H
diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h
index 989ff7faa..0957d7c81 100644
--- a/src/emoteshortcut.h
+++ b/src/emoteshortcut.h
@@ -125,4 +125,4 @@ class EmoteShortcut final
extern EmoteShortcut *emoteShortcut;
-#endif
+#endif // EMOTESHORTCUT_H
diff --git a/src/equipment.h b/src/equipment.h
index 42c1dc680..10103f205 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -103,4 +103,4 @@ class Equipment
Backend *mBackend;
};
-#endif
+#endif // EQUIPMENT_H
diff --git a/src/flooritem.h b/src/flooritem.h
index af9d2f4aa..c73b39bd4 100644
--- a/src/flooritem.h
+++ b/src/flooritem.h
@@ -113,4 +113,4 @@ class FloorItem final : public ActorSprite
Cursor::Cursor mCursor;
};
-#endif
+#endif // FLOORITEM_H
diff --git a/src/game.h b/src/game.h
index 0b3bc988c..5f13e0a7d 100644
--- a/src/game.h
+++ b/src/game.h
@@ -144,4 +144,4 @@ class Game final
static Game *mInstance;
};
-#endif
+#endif // GAME_H
diff --git a/src/graphics.h b/src/graphics.h
index 03dd5ea2e..79f25d684 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -417,4 +417,4 @@ class Graphics : public gcn::SDLGraphics
extern Graphics *mainGraphics;
-#endif
+#endif // GRAPHICS_H
diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h
index 68ea8af13..fbea60980 100644
--- a/src/graphicsmanager.h
+++ b/src/graphicsmanager.h
@@ -187,4 +187,4 @@ class GraphicsManager final
extern GraphicsManager graphicsManager;
-#endif
+#endif // GRAPHICSMANAGER_H
diff --git a/src/imageparticle.h b/src/imageparticle.h
index 85d08d43f..160567930 100644
--- a/src/imageparticle.h
+++ b/src/imageparticle.h
@@ -65,4 +65,4 @@ class ImageParticle : public Particle
Image *mImage; /**< The image used for this particle. */
};
-#endif
+#endif // IMAGEPARTICLE_H
diff --git a/src/inputevent.h b/src/inputevent.h
index cbf271842..961f7a58f 100644
--- a/src/inputevent.h
+++ b/src/inputevent.h
@@ -48,4 +48,4 @@ struct InputEvent final
int mask;
};
-#endif
+#endif // INPUTEVENT_H
diff --git a/src/inputmanager.h b/src/inputmanager.h
index ff07f6c85..9994b8fce 100644
--- a/src/inputmanager.h
+++ b/src/inputmanager.h
@@ -181,4 +181,4 @@ class InputManager final
extern InputManager inputManager;
-#endif
+#endif // INPUTMANAGER_H
diff --git a/src/inventory.h b/src/inventory.h
index f5a0f227c..2ee56a810 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -171,4 +171,4 @@ class Inventory final
int mUsed; /**< THe number of slots in use */
};
-#endif
+#endif // INVENTORY_H
diff --git a/src/item.h b/src/item.h
index 0d5917bf0..b2004622e 100644
--- a/src/item.h
+++ b/src/item.h
@@ -188,4 +188,4 @@ class Item
std::map <int, int> mTags;
};
-#endif
+#endif // ITEM_H
diff --git a/src/itemshortcut.h b/src/itemshortcut.h
index f8eda6215..78fc23558 100644
--- a/src/itemshortcut.h
+++ b/src/itemshortcut.h
@@ -153,4 +153,4 @@ class ItemShortcut final
extern ItemShortcut *itemShortcut[SHORTCUT_TABS];
-#endif
+#endif // ITEMSHORTCUT_H
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index afc8b043c..569ae95b5 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -120,4 +120,4 @@ class KeyboardConfig final
extern KeyboardConfig keyboard;
-#endif
+#endif // KEYBOARDCONFIG_H
diff --git a/src/keyboarddata.h b/src/keyboarddata.h
index 980bf1eda..f7a358a8f 100644
--- a/src/keyboarddata.h
+++ b/src/keyboarddata.h
@@ -1953,4 +1953,4 @@ static const KeyData keyData[Input::KEY_TOTAL] = {
COND_DEFAULT}
};
-#endif
+#endif // KEYBOARDDATA_H
diff --git a/src/keydata.h b/src/keydata.h
index c5c0e0aad..cfe47a8b4 100644
--- a/src/keydata.h
+++ b/src/keydata.h
@@ -345,4 +345,4 @@ namespace Input
};
} // namespace Input
-#endif
+#endif // KEYDATA_H
diff --git a/src/keyevent.h b/src/keyevent.h
index b04964679..455717f85 100644
--- a/src/keyevent.h
+++ b/src/keyevent.h
@@ -53,4 +53,4 @@ class KeyEvent final : public gcn::KeyEvent
int mActionId;
};
-#endif
+#endif // KEYEVENT_H
diff --git a/src/keyinput.h b/src/keyinput.h
index b4bffb6a5..70aab4049 100644
--- a/src/keyinput.h
+++ b/src/keyinput.h
@@ -44,4 +44,4 @@ class KeyInput final : public gcn::KeyInput
int mActionId;
};
-#endif
+#endif // KEYINPUT_H
diff --git a/src/localplayer.h b/src/localplayer.h
index 750609eb9..857b61167 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -641,4 +641,4 @@ class LocalPlayer final : public Being,
extern LocalPlayer *player_node;
-#endif
+#endif // LOCALPLAYER_H
diff --git a/src/logger.h b/src/logger.h
index 6fb9fe5d8..32499ee49 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef M_LOGGER_H
-#define M_LOGGER_H
+#ifndef LOGGER_H
+#define LOGGER_H
#include "main.h"
#include <fstream>
@@ -120,4 +120,4 @@ class Logger final
extern Logger *logger;
-#endif
+#endif // LOGGER_H
diff --git a/src/main.h b/src/main.h
index 1228c4871..39947eea1 100644
--- a/src/main.h
+++ b/src/main.h
@@ -109,4 +109,4 @@
#define PKG_DATADIR ""
#endif
-#endif
+#endif // MAIN_H
diff --git a/src/map.h b/src/map.h
index 7c414b766..ac9cd5232 100644
--- a/src/map.h
+++ b/src/map.h
@@ -535,4 +535,4 @@ class Map final : public Properties, public ConfigListener
Resource *mAtlas;
};
-#endif
+#endif // MAP_H
diff --git a/src/maplayer.h b/src/maplayer.h
index ff9c4f6db..952dd6785 100644
--- a/src/maplayer.h
+++ b/src/maplayer.h
@@ -315,4 +315,4 @@ class ObjectsLayer final
unsigned mHeight;
};
-#endif
+#endif // MAPLAYER_H
diff --git a/src/mgl.h b/src/mgl.h
index 7f30583b4..d6165dc0d 100644
--- a/src/mgl.h
+++ b/src/mgl.h
@@ -131,4 +131,4 @@ defNameE(wglGetExtensionsString);
#endif
#endif
-#endif
+#endif // MGL_H
diff --git a/src/mobileopenglgraphics.h b/src/mobileopenglgraphics.h
index 60d7fdf27..4f96ce1df 100644
--- a/src/mobileopenglgraphics.h
+++ b/src/mobileopenglgraphics.h
@@ -230,4 +230,4 @@ class MobileOpenGLGraphics final : public Graphics
};
#endif
-#endif
+#endif // MOBILEOPENGLGRAPHICS_H
diff --git a/src/mouseinput.h b/src/mouseinput.h
index c1884bfce..5753a2abf 100644
--- a/src/mouseinput.h
+++ b/src/mouseinput.h
@@ -62,4 +62,4 @@ class MouseInput final : public gcn::MouseInput
int mRealY;
};
-#endif
+#endif // MOUSEINPUT_H
diff --git a/src/mumblemanager.h b/src/mumblemanager.h
index a89a6f846..18e98841b 100644
--- a/src/mumblemanager.h
+++ b/src/mumblemanager.h
@@ -69,5 +69,5 @@ class MumbleManager final
extern MumbleManager *mumbleManager;
-#endif
-#endif
+#endif // USE_MUMBLE
+#endif // MUMBLEMANAGER_H
diff --git a/src/navigationmanager.h b/src/navigationmanager.h
index 6af9e45a6..b4ffbd400 100644
--- a/src/navigationmanager.h
+++ b/src/navigationmanager.h
@@ -50,4 +50,4 @@ class NavigationManager final
int *const data);
};
-#endif
+#endif // NAVIGATIONMANAGER_H
diff --git a/src/normalopenglgraphics.h b/src/normalopenglgraphics.h
index 40a01cd9e..9da63c32c 100644
--- a/src/normalopenglgraphics.h
+++ b/src/normalopenglgraphics.h
@@ -242,4 +242,4 @@ class NormalOpenGLGraphics final : public Graphics
};
#endif
-#endif
+#endif // NORMALOPENGLGRAPHICS_H
diff --git a/src/notifications.h b/src/notifications.h
index 34be27010..84702c6cf 100644
--- a/src/notifications.h
+++ b/src/notifications.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef NOTIFYCATIONS_H
-#define NOTIFYCATIONS_H
+#ifndef NOTIFICATIONS_H
+#define NOTIFICATIONS_H
#include "localconsts.h"
@@ -337,4 +337,4 @@ namespace NotifyManager
N_("unknown pvp"), SPEECH},
};
} // namespace NotifyManager
-#endif
+#endif // NOTIFICATIONS_H
diff --git a/src/notifymanager.h b/src/notifymanager.h
index fd6fe5eb7..3290613ab 100644
--- a/src/notifymanager.h
+++ b/src/notifymanager.h
@@ -32,4 +32,5 @@ namespace NotifyManager
void notify(const unsigned int message, const std::string &str);
int getIndexBySound(const std::string &sound);
} // namespace NotifyManager
-#endif
+
+#endif // NOTIFYMANAGER_H
diff --git a/src/nullopenglgraphics.h b/src/nullopenglgraphics.h
index 23d272e70..7f58e1242 100644
--- a/src/nullopenglgraphics.h
+++ b/src/nullopenglgraphics.h
@@ -237,4 +237,4 @@ class NullOpenGLGraphics final : public Graphics
};
#endif
-#endif
+#endif // NULLOPENGLGRAPHICS_H
diff --git a/src/particle.h b/src/particle.h
index db6591cf8..05d22454e 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -366,4 +366,4 @@ class Particle : public Actor
extern Particle *particleEngine;
-#endif
+#endif // PARTICLE_H
diff --git a/src/particlecontainer.h b/src/particlecontainer.h
index a85c2da50..40968a657 100644
--- a/src/particlecontainer.h
+++ b/src/particlecontainer.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef PARTICLE_CONTAINER_H
-#define PARTICLE_CONTAINER_H
+#ifndef PARTICLECONTAINER_H
+#define PARTICLECONTAINER_H
#include <list>
#include <vector>
@@ -135,4 +135,4 @@ protected:
std::vector<Particle *> mIndexedElements;
};
-#endif
+#endif // PARTICLECONTAINER_H
diff --git a/src/particleemitter.h b/src/particleemitter.h
index 2c4823ee9..e2f6358d3 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.h
@@ -161,4 +161,4 @@ class ParticleEmitter final
std::vector<ImageSet*> mTempSets;
};
-#endif
+#endif // PARTICLEEMITTER_H
diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h
index 24d302404..6196a1eca 100644
--- a/src/particleemitterprop.h
+++ b/src/particleemitterprop.h
@@ -20,6 +20,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef PARTICLEEMITTERPROP_H
+#define PARTICLEEMITTERPROP_H
+
#include <cmath>
#include <cstdlib>
@@ -125,3 +128,5 @@ template <typename T> struct ParticleEmitterProp final
int changePeriod;
int changePhase;
};
+
+#endif // PARTICLEEMITTERPROP_H
diff --git a/src/playerinfo.h b/src/playerinfo.h
index 8e6630adc..7eac4ef98 100644
--- a/src/playerinfo.h
+++ b/src/playerinfo.h
@@ -254,4 +254,4 @@ namespace PlayerInfo
} // namespace PlayerInfo
-#endif
+#endif // PLAYERINFO_H
diff --git a/src/playerrelations.h b/src/playerrelations.h
index 96dfb7eb6..68ec1066a 100644
--- a/src/playerrelations.h
+++ b/src/playerrelations.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef PLAYER_RELATIONS_H
-#define PLAYER_RELATIONS_H
+#ifndef PLAYERRELATIONS_H
+#define PLAYERRELATIONS_H
#include "utils/stringvector.h"
@@ -282,4 +282,4 @@ extern PlayerRelationsManager player_relations; // singleton representation
// of player relations
-#endif // PLAYER_RELATIONS_H
+#endif // PLAYERRELATIONS_H
diff --git a/src/properties.h b/src/properties.h
index 8ca9976e8..d6d2eb01b 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -132,4 +132,4 @@ class Properties
PropertyMap mProperties;
};
-#endif
+#endif // PROPERTIES_H
diff --git a/src/resources/action.h b/src/resources/action.h
index 281e95210..16f3d96d5 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ACTION_H
-#define ACTION_H
+#ifndef RESOURCES_ACTION_H
+#define RESOURCES_ACTION_H
#include <map>
@@ -61,4 +61,4 @@ class Action final
unsigned mNumber;
};
-#endif
+#endif // RESOURCES_ACTION_H
diff --git a/src/resources/ambientlayer.h b/src/resources/ambientlayer.h
index 9c07dcfc2..18bbfb69a 100644
--- a/src/resources/ambientlayer.h
+++ b/src/resources/ambientlayer.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RESOURCES_AMBIENTOVERLAY_H
-#define RESOURCES_AMBIENTOVERLAY_H
+#ifndef RESOURCES_AMBIENTLAYER_H
+#define RESOURCES_AMBIENTLAYER_H
#include "localconsts.h"
@@ -62,4 +62,4 @@ class AmbientLayer final
bool mKeepRatio; /**< Keep overlay ratio on every resolution */
};
-#endif
+#endif // RESOURCES_AMBIENTLAYER_H
diff --git a/src/resources/animation.h b/src/resources/animation.h
index d0217cdc1..09738620c 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ANIMATION_H
-#define ANIMATION_H
+#ifndef RESOURCES_ANIMATION_H
+#define RESOURCES_ANIMATION_H
#include <vector>
#include <string>
@@ -109,4 +109,4 @@ class Animation final
int mDuration;
};
-#endif
+#endif // RESOURCES_ANIMATION_H
diff --git a/src/resources/atlasmanager.h b/src/resources/atlasmanager.h
index caa9b57eb..ac53a1a54 100644
--- a/src/resources/atlasmanager.h
+++ b/src/resources/atlasmanager.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ATLASMANAGER_H
-#define ATLASMANAGER_H
+#ifndef RESOURCES_ATLASMANAGER_H
+#define RESOURCES_ATLASMANAGER_H
#ifdef USE_OPENGL
@@ -123,5 +123,5 @@ class AtlasManager final
static void convertAtlas(TextureAtlas *const atlas);
};
-#endif
-#endif
+#endif // USE_OPENGL
+#endif // RESOURCES_ATLASMANAGER_H
diff --git a/src/resources/avatardb.h b/src/resources/avatardb.h
index 2a74d1c2e..e5af78ff7 100644
--- a/src/resources/avatardb.h
+++ b/src/resources/avatardb.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef AVATAR_DB_H
-#define AVATAR_DB_H
+#ifndef RESOURCES_AVATARDB_H
+#define RESOURCES_AVATARDB_H
#include "localconsts.h"
@@ -36,4 +36,4 @@ namespace AvatarDB
BeingInfo *get(const int id) A_WARN_UNUSED;
}
-#endif
+#endif // RESOURCES_AVATARDB_H
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index 36c78f53b..e62dda149 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BEINGINFO_H
-#define BEINGINFO_H
+#ifndef RESOURCES_BEINGINFO_H
+#define RESOURCES_BEINGINFO_H
#include "actorsprite.h"
@@ -235,4 +235,4 @@ class BeingInfo final
typedef std::map<int, BeingInfo*> BeingInfos;
typedef BeingInfos::iterator BeingInfoIterator;
-#endif // BEINGINFO_H
+#endif // RESOURCES_BEINGINFO_H
diff --git a/src/resources/chardb.h b/src/resources/chardb.h
index 031ffe4e6..52f4cb8bc 100644
--- a/src/resources/chardb.h
+++ b/src/resources/chardb.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef CHARDB_MANAGER_H
-#define CHARDB_MANAGER_H
+#ifndef RESOURCES_CHARDB_H
+#define RESOURCES_CHARDB_H
#include <map>
#include <string>
@@ -64,4 +64,4 @@ namespace CharDB
const std::vector<int> &getDefaultItems() A_WARN_UNUSED;
} // namespace CharDB
-#endif
+#endif // RESOURCES_CHARDB_H
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index 60da1c4f4..ad69799d9 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef COLOR_MANAGER_H
-#define COLOR_MANAGER_H
+#ifndef RESOURCES_COLORDB_H
+#define RESOURCES_COLORDB_H
#include <map>
#include <string>
@@ -85,4 +85,4 @@ namespace ColorDB
typedef ColorLists::iterator ColorListsIterator;
} // namespace ColorDB
-#endif
+#endif // RESOURCES_COLORDB_H
diff --git a/src/resources/cursor.h b/src/resources/cursor.h
index aaaf2c758..1f597a821 100644
--- a/src/resources/cursor.h
+++ b/src/resources/cursor.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef CURSOR_H
-#define CURSOR_H
+#ifndef RESOURCES_CURSOR_H
+#define RESOURCES_CURSOR_H
#include <string>
@@ -59,4 +59,4 @@ namespace Cursor
Cursor stringToCursor(const std::string &name) A_WARN_UNUSED;
} // namespace Cursor
-#endif
+#endif // RESOURCES_CURSOR_H
diff --git a/src/resources/dye.h b/src/resources/dye.h
index efcf95420..95a4dbdae 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef DYE_H
-#define DYE_H
+#ifndef RESOURCES_DYE_H
+#define RESOURCES_DYE_H
#include "resources/dyecolor.h"
@@ -144,4 +144,4 @@ class Dye final
DyePalette *mDyePalettes[dyePalateSize];
};
-#endif
+#endif // RESOURCES_DYE_H
diff --git a/src/resources/dyecolor.h b/src/resources/dyecolor.h
index 77351a042..e9a6a5950 100644
--- a/src/resources/dyecolor.h
+++ b/src/resources/dyecolor.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef DYECOLOR_H
-#define DYECOLOR_H
+#ifndef RESOURCES_DYECOLOR_H
+#define RESOURCES_DYECOLOR_H
#include <SDL_stdinc.h>
@@ -52,4 +52,4 @@ struct DyeColor
uint8_t value[4];
};
-#endif
+#endif // RESOURCES_DYECOLOR_H
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 939b3d667..b0b232653 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EMOTE_DB_H
-#define EMOTE_DB_H
+#ifndef RESOURCES_EMOTEDB_H
+#define RESOURCES_EMOTEDB_H
#include "utils/stringvector.h"
@@ -84,4 +84,4 @@ namespace EmoteDB
typedef EmoteInfos::iterator EmoteInfosIterator;
} // namespace EmoteDB
-#endif
+#endif // RESOURCES_EMOTEDB_H
diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h
index ead076fa8..20fef77e3 100644
--- a/src/resources/fboinfo.h
+++ b/src/resources/fboinfo.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef FBOINFO_H
-#define FBOINFO_H
+#ifndef RESOURCES_FBOINFO_H
+#define RESOURCES_FBOINFO_H
#include "main.h"
#ifdef USE_OPENGL
@@ -48,5 +48,5 @@ struct FBOInfo final
GLuint rboId;
};
-#endif
-#endif
+#endif // USE_OPENGL
+#endif // RESOURCES_FBOINFO_H
diff --git a/src/resources/image.h b/src/resources/image.h
index fb99c2cdf..78eb07d7f 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef IMAGE_H
-#define IMAGE_H
+#ifndef RESOURCES_IMAGE_H
+#define RESOURCES_IMAGE_H
#include "localconsts.h"
#include "main.h"
@@ -220,4 +220,4 @@ class Image : public Resource
#endif
};
-#endif
+#endif // RESOURCES_IMAGE_H
diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h
index b55714787..cf01a3f1e 100644
--- a/src/resources/imagehelper.h
+++ b/src/resources/imagehelper.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef IMAGEHELPER_H
-#define IMAGEHELPER_H
+#ifndef RESOURCES_IMAGEHELPER_H
+#define RESOURCES_IMAGEHELPER_H
#include "localconsts.h"
@@ -106,4 +106,4 @@ class ImageHelper
extern ImageHelper *imageHelper;
extern ImageHelper *sdlImageHelper;
-#endif
+#endif // RESOURCES_IMAGEHELPER_H
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index 80ee84ba2..140232af0 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef IMAGESET_H
-#define IMAGESET_H
+#ifndef RESOURCES_IMAGESET_H
+#define RESOURCES_IMAGESET_H
#include "resources/resource.h"
@@ -90,4 +90,4 @@ class ImageSet : public Resource
int mOffsetY;
};
-#endif
+#endif // RESOURCES_IMAGESET_H
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index b88e0aec9..c71f61ca3 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.h
@@ -20,6 +20,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef RESOURCES_IMAGEWRITER_H
+#define RESOURCES_IMAGEWRITER_H
+
#include <iosfwd>
#include <string>
@@ -34,3 +37,5 @@ class ImageWriter final
static bool writePNG(SDL_Surface *const surface,
const std::string &filename);
};
+
+#endif // RESOURCES_IMAGEWRITER_H
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 44ab68f6d..6e23c7017 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ITEM_MANAGER_H
-#define ITEM_MANAGER_H
+#ifndef RESOURCES_ITEMDB_H
+#define RESOURCES_ITEMDB_H
#include "utils/stringvector.h"
@@ -73,4 +73,4 @@ namespace ItemDB
void setStatsList(const std::vector<Stat> &stats);
} // namespace ItemDB
-#endif
+#endif // RESOURCES_ITEMDB_H
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index c1c9f9d27..a3b606dc8 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ITEMINFO_H
-#define ITEMINFO_H
+#ifndef RESOURCES_ITEMINFO_H
+#define RESOURCES_ITEMINFO_H
#include "being.h"
@@ -340,4 +340,4 @@ class ItemInfo final
bool mProtected;
};
-#endif
+#endif // RESOURCES_ITEMINFO_H
diff --git a/src/resources/mapdb.h b/src/resources/mapdb.h
index 9889c4dc8..9e0407f66 100644
--- a/src/resources/mapdb.h
+++ b/src/resources/mapdb.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MAPDB_H
-#define MAPDB_H
+#ifndef RESOURCES_MAPDB_H
+#define RESOURCES_MAPDB_H
#include "utils/stringvector.h"
@@ -75,4 +75,4 @@ namespace MapDB
typedef Atlases::const_iterator AtlasCIter;
} // namespace MapDB
-#endif
+#endif // RESOURCES_MAPDB_H
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index fa7254b51..0dbc299d2 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MAPREADER_H
-#define MAPREADER_H
+#ifndef RESOURCES_MAPREADER_H
+#define RESOURCES_MAPREADER_H
#include "utils/xml.h"
@@ -90,4 +90,4 @@ class MapReader final
static void updateMusic(Map *const map);
};
-#endif
+#endif // RESOURCES_MAPREADER_H
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 20e885ce5..4d88320b5 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MONSTER_DB_H
-#define MONSTER_DB_H
+#ifndef RESOURCES_MONSTERDB_H
+#define RESOURCES_MONSTERDB_H
#include "localconsts.h"
@@ -39,4 +39,4 @@ namespace MonsterDB
BeingInfo *get(const int id) A_WARN_UNUSED;
}
-#endif
+#endif // RESOURCES_MONSTERDB_H
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index 61641eaec..a01730ed8 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef NPC_DB_H
-#define NPC_DB_H
+#ifndef RESOURCES_NPCDB_H
+#define RESOURCES_NPCDB_H
#include <stdint.h>
@@ -43,4 +43,4 @@ namespace NPCDB
uint16_t getAvatarFor(const int id);
}
-#endif
+#endif // RESOURCES_NPCDB_H
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index 5c144809a..e19c5e735 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef OPENGLIMAGEHELPER_H
-#define OPENGLIMAGEHELPER_H
+#ifndef RESOURCES_OPENGLIMAGEHELPER_H
+#define RESOURCES_OPENGLIMAGEHELPER_H
#include "localconsts.h"
#include "main.h"
@@ -147,4 +147,4 @@ class OpenGLImageHelper final : public ImageHelper
};
#endif
-#endif
+#endif // RESOURCES_OPENGLIMAGEHELPER_H
diff --git a/src/resources/palettedb.h b/src/resources/palettedb.h
index 28b901799..307178693 100644
--- a/src/resources/palettedb.h
+++ b/src/resources/palettedb.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef PALETTEDB_H
-#define PALETTEDB_H
+#ifndef RESOURCES_PALETTEDB_H
+#define RESOURCES_PALETTEDB_H
#include "localconsts.h"
@@ -36,4 +36,4 @@ namespace PaletteDB
} // namespace PaletteDB
-#endif
+#endif // RESOURCES_PALETTEDB_H
diff --git a/src/resources/petdb.h b/src/resources/petdb.h
index 755937902..4c43f1869 100644
--- a/src/resources/petdb.h
+++ b/src/resources/petdb.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef PET_DB_H
-#define PET_DB_H
+#ifndef RESOURCES_PETDB_H
+#define RESOURCES_PETDB_H
#include <stdint.h>
@@ -38,4 +38,4 @@ namespace PETDB
BeingInfo *get(const int id) A_WARN_UNUSED;
}
-#endif
+#endif // RESOURCES_PETDB_H
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 884e58dc6..4c1eef90a 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RESOURCE_H
-#define RESOURCE_H
+#ifndef RESOURCES_RESOURCE_H
+#define RESOURCES_RESOURCE_H
#include "main.h"
@@ -121,4 +121,4 @@ class Resource
#endif
};
-#endif
+#endif // RESOURCES_RESOURCE_H
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index d56406bec..0c40dc1b7 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RESOURCE_MANAGER_H
-#define RESOURCE_MANAGER_H
+#ifndef RESOURCES_RESOURCEMANAGER_H
+#define RESOURCES_RESOURCEMANAGER_H
#include "main.h"
@@ -353,4 +353,4 @@ class ResourceManager final
static DelayedAnim mDelayedAnimations;
};
-#endif
+#endif // RESOURCES_RESOURCEMANAGER_H
diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h
index 8a538ca3c..291345164 100644
--- a/src/resources/sdlimagehelper.h
+++ b/src/resources/sdlimagehelper.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SDLIMAGEHELPER_H
-#define SDLIMAGEHELPER_H
+#ifndef RESOURCES_SDLIMAGEHELPER_H
+#define RESOURCES_SDLIMAGEHELPER_H
#include "localconsts.h"
@@ -94,4 +94,4 @@ class SDLImageHelper final : public ImageHelper
static bool mEnableAlphaCache;
};
-#endif
+#endif // RESOURCES_SDLIMAGEHELPER_H
diff --git a/src/resources/sdlmusic.h b/src/resources/sdlmusic.h
index 8d2b24044..05a5528b7 100644
--- a/src/resources/sdlmusic.h
+++ b/src/resources/sdlmusic.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SDLMUSIC_H
-#define SDLMUSIC_H
+#ifndef RESOURCES_SDLMUSIC_H
+#define RESOURCES_SDLMUSIC_H
#include "resources/resource.h"
@@ -78,4 +78,4 @@ class SDLMusic final : public Resource
Mix_Music *mMusic;
};
-#endif
+#endif // RESOURCES_SDLMUSIC_H
diff --git a/src/resources/sounddb.h b/src/resources/sounddb.h
index 560cdb4be..864d23fb9 100644
--- a/src/resources/sounddb.h
+++ b/src/resources/sounddb.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SOUNDDB_H
-#define SOUNDDB_H
+#ifndef RESOURCES_SOUNDDB_H
+#define RESOURCES_SOUNDDB_H
#include <map>
#include <string>
@@ -35,4 +35,4 @@ namespace SoundDB
std::string &getSound(const int id);
}
-#endif
+#endif // RESOURCES_SOUNDDB_H
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 33a406128..3b6724820 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SOUND_EFFECT_H
-#define SOUND_EFFECT_H
+#ifndef RESOURCES_SOUNDEFFECT_H
+#define RESOURCES_SOUNDEFFECT_H
#include "resources/resource.h"
@@ -77,4 +77,4 @@ class SoundEffect final : public Resource
Mix_Chunk *mChunk;
};
-#endif // SOUND_EFFECT_H
+#endif // RESOURCES_SOUNDEFFECT_H
diff --git a/src/resources/soundinfo.h b/src/resources/soundinfo.h
index f60892e1c..30fe8675d 100644
--- a/src/resources/soundinfo.h
+++ b/src/resources/soundinfo.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SOUNDINFO_H
-#define SOUNDINFO_H
+#ifndef RESOURCES_SOUNDINFO_H
+#define RESOURCES_SOUNDINFO_H
#include <string>
#include <vector>
@@ -40,4 +40,4 @@ struct SoundInfo final
typedef std::vector<SoundInfo> SoundInfoVect;
-#endif
+#endif // RESOURCES_SOUNDINFO_H
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 2da538baf..2a01bb9d7 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SPRITEDEF_H
-#define SPRITEDEF_H
+#ifndef RESOURCES_SPRITEDEF_H
+#define RESOURCES_SPRITEDEF_H
#include "resources/resource.h"
@@ -226,4 +226,4 @@ class SpriteDef final : public Resource
std::set<std::string> mProcessedFiles;
};
-#endif // SPRITEDEF_H
+#endif // RESOURCES_SPRITEDEF_H
diff --git a/src/resources/subimage.h b/src/resources/subimage.h
index c3bb1482e..8dae594f6 100644
--- a/src/resources/subimage.h
+++ b/src/resources/subimage.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUBIMAGE_H
-#define SUBIMAGE_H
+#ifndef RESOURCES_SUBIMAGE_H
+#define RESOURCES_SUBIMAGE_H
#include "localconsts.h"
#include "main.h"
@@ -81,4 +81,4 @@ class SubImage final : public Image
Image *mParent;
};
-#endif
+#endif // RESOURCES_SUBIMAGE_H
diff --git a/src/resources/wallpaper.h b/src/resources/wallpaper.h
index cb3078b14..98cf58ae1 100644
--- a/src/resources/wallpaper.h
+++ b/src/resources/wallpaper.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef WALLPAPER_H
-#define WALLPAPER_H
+#ifndef RESOURCES_WALLPAPER_H
+#define RESOURCES_WALLPAPER_H
#include <string>
@@ -51,4 +51,4 @@ class Wallpaper final
const int height) A_WARN_UNUSED;
};
-#endif // WALLPAPER_H
+#endif // RESOURCES_WALLPAPER_H
diff --git a/src/rotationalparticle.h b/src/rotationalparticle.h
index 248728bf7..d0108e530 100644
--- a/src/rotationalparticle.h
+++ b/src/rotationalparticle.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ROTATIONAL_PARTICLE_H
-#define ROTATIONAL_PARTICLE_H
+#ifndef ROTATIONALPARTICLE_H
+#define ROTATIONALPARTICLE_H
#include "imageparticle.h"
@@ -49,4 +49,4 @@ class RotationalParticle final : public ImageParticle
SimpleAnimation *mAnimation; /**< Used animation for this particle */
};
-#endif
+#endif // ROTATIONALPARTICLE_H
diff --git a/src/safeopenglgraphics.h b/src/safeopenglgraphics.h
index 61a34e07c..c134caa2d 100644
--- a/src/safeopenglgraphics.h
+++ b/src/safeopenglgraphics.h
@@ -162,4 +162,4 @@ class SafeOpenGLGraphics final : public Graphics
};
#endif
-#endif
+#endif // SAFEOPENGLGRAPHICS_H
diff --git a/src/shopitem.h b/src/shopitem.h
index 26616b35a..bf8fd20f2 100644
--- a/src/shopitem.h
+++ b/src/shopitem.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef M_SHOPITEM_H
-#define M_SHOPITEM_H
+#ifndef SHOPITEM_H
+#define SHOPITEM_H
#include "item.h"
@@ -147,4 +147,4 @@ class ShopItem final : public Item
std::stack<DuplicateItem*> mDuplicates; /** <-- Stores duplicates */
};
-#endif
+#endif // SHOPITEM_H
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index 61a4ef152..3e382c9f6 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SIMPLEANIMAION_H
-#define SIMPLEANIMAION_H
+#ifndef SIMPLEANIMATION_H
+#define SIMPLEANIMATION_H
#include "utils/xml.h"
@@ -96,4 +96,4 @@ class SimpleAnimation final
ImageSet *mImageSet;
};
-#endif
+#endif // SIMPLEANIMATION_H
diff --git a/src/soundmanager.h b/src/soundmanager.h
index 444c81771..09e424238 100644
--- a/src/soundmanager.h
+++ b/src/soundmanager.h
@@ -176,4 +176,4 @@ class SoundManager final : public ConfigListener
extern SoundManager soundManager;
-#endif
+#endif // SOUNDMANAGER_H
diff --git a/src/spellshortcut.h b/src/spellshortcut.h
index 58c772a20..c2f6b87ff 100644
--- a/src/spellshortcut.h
+++ b/src/spellshortcut.h
@@ -90,4 +90,4 @@ class SpellShortcut final
extern SpellShortcut *spellShortcut;
extern SpellManager *spellManager;
-#endif
+#endif // SPELLSHORTCUT_H
diff --git a/src/statuseffect.h b/src/statuseffect.h
index 442d3bd06..15b0bd1e1 100644
--- a/src/statuseffect.h
+++ b/src/statuseffect.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef STATUS_EFFECT_H
-#define STATUS_EFFECT_H
+#ifndef STATUSEFFECT_H
+#define STATUSEFFECT_H
#include "particle.h"
#include "animatedsprite.h"
@@ -115,4 +115,4 @@ private:
bool mPersistentParticleEffect;
};
-#endif // !defined(STATUS_EFFECT_H)
+#endif // STATUSEFFECT_H
diff --git a/src/textcommand.h b/src/textcommand.h
index 0af4ae7e3..b39cafaff 100644
--- a/src/textcommand.h
+++ b/src/textcommand.h
@@ -182,4 +182,4 @@ class TextCommand final
Image *mImage;
};
-#endif
+#endif // TEXTCOMMAND_H
diff --git a/src/textparticle.h b/src/textparticle.h
index 9882fa22e..802c11e56 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -59,4 +59,4 @@ class TextParticle final : public Particle
int mTextWidth;
};
-#endif
+#endif // TEXTPARTICLE_H
diff --git a/src/tileset.h b/src/tileset.h
index 5ef3f6a23..57e1056a9 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -76,4 +76,4 @@ class Tileset final : public ImageSet
std::map<std::string, std::string> mProperties;
};
-#endif
+#endif // TILESET_H
diff --git a/src/touchactions.h b/src/touchactions.h
index f0b52b097..4d9a8a60c 100644
--- a/src/touchactions.h
+++ b/src/touchactions.h
@@ -38,4 +38,4 @@ void setHalfJoyPad(const int s);
#undef decHandler
-#endif
+#endif // TOUCHACTIONS_H
diff --git a/src/touchmanager.h b/src/touchmanager.h
index 2f5deaba3..8f2e4cf8c 100644
--- a/src/touchmanager.h
+++ b/src/touchmanager.h
@@ -180,4 +180,6 @@ class TouchManager final : public ConfigListener
};
extern TouchManager touchManager;
-#endif
+
+#endif // TOUCHMANAGER_H
+
diff --git a/src/utils/base64.h b/src/utils/base64.h
index b0c349277..6ebac7983 100644
--- a/src/utils/base64.h
+++ b/src/utils/base64.h
@@ -27,8 +27,8 @@
+----------------------------------------------------------------------+
*/
-#ifndef BASE64_H
-#define BASE64_H
+#ifndef UTILS_BASE64_H
+#define UTILS_BASE64_H
#include "localconsts.h"
@@ -37,4 +37,4 @@ extern unsigned char *php3_base64_encode(const unsigned char *,
extern unsigned char *php3_base64_decode(const unsigned char *,
int, int *) A_WARN_UNUSED;
-#endif /* BASE64_H */
+#endif // UTILS_BASE64_H
diff --git a/src/utils/copynpaste.h b/src/utils/copynpaste.h
index ea827158d..1a6069267 100644
--- a/src/utils/copynpaste.h
+++ b/src/utils/copynpaste.h
@@ -19,6 +19,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef UTILS_COPYNPASTE_H
+#define UTILS_COPYNPASTE_H
+
#include <string>
#include "localconsts.h"
@@ -35,3 +38,5 @@
bool retrieveBuffer(std::string& text, size_t& pos) A_WARN_UNUSED;
bool sendBuffer(std::string& text);
+
+#endif // UTILS_COPYNPASTE_H
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 17eee70ce..d1bdd8777 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -54,4 +54,4 @@ inline void delete_all(Container &c)
std::for_each(c.begin(), c.end(), make_dtor(c));
}
-#endif
+#endif // UTILS_DTOR_H
diff --git a/src/utils/mkdir.h b/src/utils/mkdir.h
index 1eb5e1c82..591f2ca95 100644
--- a/src/utils/mkdir.h
+++ b/src/utils/mkdir.h
@@ -19,9 +19,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef M_MKDIR_H
-#define M_MKDIR_H
+#ifndef UTILS_MKDIR_H
+#define UTILS_MKDIR_H
int mkdir_r(const char *const pathname);
-#endif
+#endif // UTILS_MKDIR_H
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index 03ecc9fe1..37c889e02 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MUTEX_H
-#define MUTEX_H
+#ifndef UTILS_MUTEX_H
+#define UTILS_MUTEX_H
#include "logger.h"
@@ -100,4 +100,4 @@ inline MutexLocker::~MutexLocker()
mMutex->unlock();
}
-#endif // MUTEX_H
+#endif // UTILS_MUTEX_H
diff --git a/src/utils/perfomance.h b/src/utils/perfomance.h
index a70bc42a6..c3a79c722 100644
--- a/src/utils/perfomance.h
+++ b/src/utils/perfomance.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef UTILS_PEFOMANCE_H
-#define UTILS_PEFOMANCE_H
+#ifndef UTILS_PERFOMANCE_H
+#define UTILS_PERFOMANCE_H
#ifdef USE_PROFILER
#include <string>
@@ -73,4 +73,4 @@ namespace Perfomance
#define FUNC_BLOCK(name, id)
#endif // USE_PROFILER
-#endif // UTILS_PEFOMANCE_H
+#endif // UTILS_PERFOMANCE_H
diff --git a/src/utils/physfsrwops.h b/src/utils/physfsrwops.h
index c7d85bd22..fb0285e0a 100644
--- a/src/utils/physfsrwops.h
+++ b/src/utils/physfsrwops.h
@@ -79,6 +79,4 @@ SDL_RWops *PHYSFSRWOPS_openAppend(const char *const fname) A_WARN_UNUSED;
*/
SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *const handle) A_WARN_UNUSED;
-#endif /* include-once blocker */
-
-/* end of physfsrwops.h ... */
+#endif // UTILS_PHYSFSRWOPS_H
diff --git a/src/utils/physfstools.h b/src/utils/physfstools.h
index 47625ca76..cb64a981b 100644
--- a/src/utils/physfstools.h
+++ b/src/utils/physfstools.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef UTILS_PHYSFS_H
-#define UTILS_PHYSFS_H
+#ifndef UTILS_PHYSFSTOOLS_H
+#define UTILS_PHYSFSTOOLS_H
#include <physfs.h>
@@ -45,4 +45,4 @@ namespace PhysFs
extern const char *dirSeparator;
-#endif // UTILS_PHYSFS_H
+#endif // UTILS_PHYSFSTOOLS_H
diff --git a/src/utils/specialfolder.h b/src/utils/specialfolder.h
index 2ee91e2c3..0506c5c26 100644
--- a/src/utils/specialfolder.h
+++ b/src/utils/specialfolder.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef M_SPECIALFOLDER_H
-#define M_SPECIALFOLDER_H
+#ifndef UTILS_SPECIALFOLDER_H
+#define UTILS_SPECIALFOLDER_H
#ifdef WIN32
#include <shlobj.h>
@@ -30,4 +30,4 @@
std::string getSpecialFolderLocation(const int folderId) A_WARN_UNUSED;
#endif
-#endif
+#endif // UTILS_SPECIALFOLDER_H
diff --git a/src/utils/stringvector.h b/src/utils/stringvector.h
index ab8f77c51..fc313e0c3 100644
--- a/src/utils/stringvector.h
+++ b/src/utils/stringvector.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef UTILS_VECTORSTRING_H
-#define UTILS_VECTORSTRING_H
+#ifndef UTILS_STRINGVECTOR_H
+#define UTILS_STRINGVECTOR_H
#include <string>
#include <vector>
@@ -28,4 +28,4 @@ typedef std::vector<std::string> StringVect;
typedef StringVect::iterator StringVectIter;
typedef StringVect::const_iterator StringVectCIter;
-#endif
+#endif // UTILS_STRINGVECTOR_H
diff --git a/src/utils/translation/translationmanager.h b/src/utils/translation/translationmanager.h
index 8a6f0c1e0..8d890fbd7 100644
--- a/src/utils/translation/translationmanager.h
+++ b/src/utils/translation/translationmanager.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef UTILS_TRANSLATION_MANAGER_H
-#define UTILS_TRANSLATION_MANAGER_H
+#ifndef UTILS_TRANSLATION_TRANSLATIONMANAGER_H
+#define UTILS_TRANSLATION_TRANSLATIONMANAGER_H
#include "localconsts.h"
@@ -45,4 +45,4 @@ class TranslationManager final
StringVect &lines);
};
-#endif // UTILS_TRANSLATION_MANAGER_H
+#endif // UTILS_TRANSLATION_TRANSLATIONMANAGER_H
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 75f671b02..d67747659 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef XML_H
-#define XML_H
+#ifndef UTILS_XML_H
+#define UTILS_XML_H
#include <libxml/encoding.h>
#include <libxml/xmlwriter.h>
@@ -144,4 +144,4 @@ namespace XML
#define for_each_xml_child_node(var, parent) \
for (XmlNodePtr var = parent->xmlChildrenNode; var; var = var->next)
-#endif // XML_H
+#endif // UTILS_XML_H
diff --git a/src/variabledata.h b/src/variabledata.h
index af5f7ab9c..a0c0e5be1 100644
--- a/src/variabledata.h
+++ b/src/variabledata.h
@@ -112,4 +112,4 @@ class BoolData final : public VariableData
bool mData;
};
-#endif
+#endif // VARIABLEDATA_H
diff --git a/src/walklayer.h b/src/walklayer.h
index 104920471..c8b729207 100644
--- a/src/walklayer.h
+++ b/src/walklayer.h
@@ -45,4 +45,4 @@ class WalkLayer final : public Resource
int *mTiles;
};
-#endif
+#endif // WALKLAYER_H