Removed the TMW branding from header guards

18 files changed, 41 insertions, 39 deletions

diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index a9d6743b..f72f0380 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_BEINGHANDLER_H
-#define _TMW_NET_BEINGHANDLER_H
+#ifndef NET_BEINGHANDLER_H
+#define NET_BEINGHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index eb1f5853..0ede7b48 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_BUYSELLHANDLER_H
-#define _TMW_NET_BUYSELLHANDLER_H
+#ifndef NET_BUYSELLHANDLER_H
+#define NET_BUYSELLHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 7e711fd9..37b378f2 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_CHARSERVERHANDLER_H
-#define _TMW_NET_CHARSERVERHANDLER_H
+#ifndef NET_CHARSERVERHANDLER_H
+#define NET_CHARSERVERHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index 6393e401..ff649205 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_CHATHANDLER_H
-#define _TMW_NET_CHATHANDLER_H
+#ifndef NET_CHATHANDLER_H
+#define NET_CHATHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/equipmenthandler.h b/src/net/equipmenthandler.h
index d477885d..c66d7932 100644
--- a/src/net/equipmenthandler.h
+++ b/src/net/equipmenthandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_EQUIPMENTHANDLER_H
-#define _TMW_NET_EQUIPMENTHANDLER_H
+#ifndef NET_EQUIPMENTHANDLER_H
+#define NET_EQUIPMENTHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index d18e428a..336b2e98 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_INVENTORYHANDLER_H
-#define _TMW_NET_INVENTORYHANDLER_H
+#ifndef NET_INVENTORYHANDLER_H
+#define NET_INVENTORYHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/itemhandler.h b/src/net/itemhandler.h
index 621b7097..0cb3b42a 100644
--- a/src/net/itemhandler.h
+++ b/src/net/itemhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_ITEMHANDLER_H
-#define _TMW_NET_ITEMHANDLER_H
+#ifndef NET_ITEMHANDLER_H
+#define NET_ITEMHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index d41b8347..a380c767 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_LOGINHANDLER_H
-#define _TMW_NET_LOGINHANDLER_H
+#ifndef NET_LOGINHANDLER_H
+#define NET_LOGINHANDLER_H
 
 #include "messagehandler.h"
 #include <string>
diff --git a/src/net/maploginhandler.h b/src/net/maploginhandler.h
index a7267372..c7fee70c 100644
--- a/src/net/maploginhandler.h
+++ b/src/net/maploginhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_MAPLOGINHANDLER_H
-#define _TMW_NET_MAPLOGINHANDLER_H
+#ifndef NET_MAPLOGINHANDLER_H
+#define NET_MAPLOGINHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index f46da788..45cdf8cd 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_MESSAGEHANDLER_H
-#define _TMW_NET_MESSAGEHANDLER_H
+#ifndef NET_MESSAGEHANDLER_H
+#define NET_MESSAGEHANDLER_H
 
 #include <SDL_types.h>
 
diff --git a/src/net/messagein.h b/src/net/messagein.h
index 534d289c..1788aa97 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MESSAGEIN_
-#define _TMW_MESSAGEIN_
+#ifndef MESSAGEIN_
+#define MESSAGEIN_
 
 #include <string>
 #include <SDL_types.h>
diff --git a/src/net/messageout.h b/src/net/messageout.h
index d377229a..b3a4ef68 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MESSAGEOUT_
-#define _TMW_MESSAGEOUT_
+#ifndef MESSAGEOUT_
+#define MESSAGEOUT_
 
 #include <iosfwd>
 #include <SDL_types.h>
diff --git a/src/net/network.h b/src/net/network.h
index af4055d4..c942a819 100644
--- a/src/net/network.h
+++ b/src/net/network.h
@@ -19,17 +19,19 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NETWORK_
-#define _TMW_NETWORK_
+#ifndef NETWORK_
+#define NETWORK_
 
 #include <map>
 #include <SDL_net.h>
 #include <SDL_thread.h>
 #include <string>
 
-#define TMW_CLIENT_PROTOCOL_VERSION	1
-	/**< Protocol version, reported to the eAthena char and mapserver who
-             can adjust the protocol accordingly */
+/**
+ * Protocol version, reported to the eAthena char and mapserver who can adjust
+ * the protocol accordingly.
+ */
+#define CLIENT_PROTOCOL_VERSION      1
 
 class MessageHandler;
 class MessageIn;
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index f47af523..7ac962eb 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_NPCHANDLER_H
-#define _TMW_NET_NPCHANDLER_H
+#ifndef NET_NPCHANDLER_H
+#define NET_NPCHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index ceefadf6..1a7c8da3 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_PLAYERHANDLER_H
-#define _TMW_NET_PLAYERHANDLER_H
+#ifndef NET_PLAYERHANDLER_H
+#define NET_PLAYERHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 86ab9066..b70834c6 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_PROTOCOL_
-#define _TMW_PROTOCOL_
+#ifndef PROTOCOL_
+#define PROTOCOL_
 
 // Packets from server to client
 #define SMSG_LOGIN_SUCCESS           0x0073 /**< Contains starting location */
diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h
index 44a0f894..2b55605d 100644
--- a/src/net/skillhandler.h
+++ b/src/net/skillhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_SKILLHANDLER_H
-#define _TMW_NET_SKILLHANDLER_H
+#ifndef NET_SKILLHANDLER_H
+#define NET_SKILLHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 730c6971..d479e43f 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_TRADEHANDLER_H
-#define _TMW_NET_TRADEHANDLER_H
+#ifndef NET_TRADEHANDLER_H
+#define NET_TRADEHANDLER_H
 
 #include "messagehandler.h"