Removed the TMW branding from header guards

19 files changed, 39 insertions, 39 deletions

diff --git a/src/resources/action.h b/src/resources/action.h
index bfb5d892..c557e6da 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ACTION_H
-#define _TMW_ACTION_H
+#ifndef ACTION_H
+#define ACTION_H
 
 #include <map>
 
diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h
index 1b03a19c..65f9891d 100644
--- a/src/resources/ambientoverlay.h
+++ b/src/resources/ambientoverlay.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_RESOURCES_AMBIENTOVERLAY_H_
-#define _TMW_RESOURCES_AMBIENTOVERLAY_H_
+#ifndef RESOURCES_AMBIENTOVERLAY_H
+#define RESOURCES_AMBIENTOVERLAY_H
 
 class Graphics;
 class Image;
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 9f161e15..29c99209 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ANIMATION_H
-#define _TMW_ANIMATION_H
+#ifndef ANIMATION_H
+#define ANIMATION_H
 
 #include <vector>
 
diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h
index ef5c0d48..33fcde4d 100644
--- a/src/resources/buddylist.h
+++ b/src/resources/buddylist.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_BUDDYLIST_H
-#define _TMW_BUDDYLIST_H
+#ifndef BUDDYLIST_H
+#define BUDDYLIST_H
 
 #include <list>
 #include <string>
@@ -76,4 +76,4 @@ class BuddyList : public gcn::ListModel {
         std::string mFilename;            /* File to work with */
 };
 
-#endif /* _TMW_BUDDYLIST_H */
+#endif /* BUDDYLIST_H */
diff --git a/src/resources/dye.h b/src/resources/dye.h
index 305423b0..d32c3f22 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_DYE_H
-#define _TMW_DYE_H
+#ifndef DYE_H
+#define DYE_H
 
 #include <vector>
 
diff --git a/src/resources/image.h b/src/resources/image.h
index 2c0569f9..963fbb24 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_IMAGE_H
-#define _TMW_IMAGE_H
+#ifndef IMAGE_H
+#define IMAGE_H
 
 #include "../main.h"
 
diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h
index bb9d3c0c..1d6c9ae4 100644
--- a/src/resources/imageloader.h
+++ b/src/resources/imageloader.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_IMAGELOADER_H
-#define _TMW_IMAGELOADER_H
+#ifndef IMAGELOADER_H
+#define IMAGELOADER_H
 
 #include <string>
 
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index 605cf19b..00a36754 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_IMAGESET_H
-#define _TMW_IMAGESET_H
+#ifndef IMAGESET_H
+#define IMAGESET_H
 
 #include <vector>
 
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 7510da97..03fb1eed 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEM_MANAGER_H
-#define _TMW_ITEM_MANAGER_H
+#ifndef ITEM_MANAGER_H
+#define ITEM_MANAGER_H
 
 #include "iteminfo.h"
 
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 7f0d548f..a04213ff 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEMINFO_H_
-#define _TMW_ITEMINFO_H_
+#ifndef ITEMINFO_H
+#define ITEMINFO_H
 
 #include <map>
 #include <string>
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index 3eba83e0..8cb2749d 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MAPREADER_H_
-#define _TMW_MAPREADER_H_
+#ifndef MAPREADER_H
+#define MAPREADER_H
 
 #include <iosfwd>
 
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index c8cd95bd..8555670b 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MONSTER_DB_H
-#define _TMW_MONSTER_DB_H
+#ifndef MONSTER_DB_H
+#define MONSTER_DB_H
 
 #include <map>
 
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 076f9e95..b37ac1a9 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MONSTERINFO_H_
-#define _TMW_MONSTERINFO_H_
+#ifndef MONSTERINFO_H
+#define MONSTERINFO_H
 
 #include <map>
 #include <string>
diff --git a/src/resources/music.h b/src/resources/music.h
index 709a9ff6..cff18338 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MUSIC_H
-#define _TMW_MUSIC_H
+#ifndef MUSIC_H
+#define MUSIC_H
 
 #include <SDL_mixer.h>
 
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index bafb5e38..a7f28c50 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NPC_DB_H
-#define _TMW_NPC_DB_H
+#ifndef NPC_DB_H
+#define NPC_DB_H
 
 #include <map>
 #include <list>
diff --git a/src/resources/resource.h b/src/resources/resource.h
index ebbdf90c..0dc50c03 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_RESOURCE_H
-#define _TMW_RESOURCE_H
+#ifndef RESOURCE_H
+#define RESOURCE_H
 
 #include <ctime>
 #include <string>
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index e6e37d25..6a7a2ed6 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_RESOURCE_MANAGER_H
-#define _TMW_RESOURCE_MANAGER_H
+#ifndef RESOURCE_MANAGER_H
+#define RESOURCE_MANAGER_H
 
 #include <ctime>
 #include <map>
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 23c1ec2a..5f511b29 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SOUND_EFFECT_H
-#define _TMW_SOUND_EFFECT_H
+#ifndef SOUND_EFFECT_H
+#define SOUND_EFFECT_H
 
 #include <SDL_mixer.h>
 
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 4628e53e..b86a4c4d 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SPRITEDEF_H
-#define _TMW_SPRITEDEF_H
+#ifndef SPRITEDEF_H
+#define SPRITEDEF_H
 
 #include <map>
 #include <string>