Put the remaining unnamespaced handlers in a namespace

Also fixed some initialization order warnings when compiling with
tmwserv support and made two getters const.

10 files changed, 40 insertions, 2 deletions

diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 2fe5bedc..6ab73b4c 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -41,6 +41,8 @@
 
 extern NpcTextDialog *npcTextDialog;
 
+namespace EAthena {
+
 const int EMOTION_TIME = 150;    /**< Duration of emotion icon */
 
 BeingHandler::BeingHandler(bool enableSync):
@@ -600,3 +602,5 @@ void BeingHandler::handleMessage(MessageIn &msg)
             break;
     }
 }
+
+} // namespace EAthena
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index 83ac9fb4..97001579 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -24,6 +24,8 @@
 
 #include "net/messagehandler.h"
 
+namespace EAthena {
+
 class BeingHandler : public MessageHandler
 {
     public:
@@ -36,4 +38,6 @@ class BeingHandler : public MessageHandler
         bool mSync;
 };
 
+} // namespace EAthena
+
 #endif // NET_EA_BEINGHANDLER_H
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 69726384..ca155228 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -39,6 +39,8 @@
 
 #include "utils/gettext.h"
 
+namespace EAthena {
+
 BuySellHandler::BuySellHandler()
 {
     static const Uint16 _messages[] = {
@@ -134,3 +136,5 @@ void BuySellHandler::handleMessage(MessageIn &msg)
             break;
     }
 }
+
+} // namespace EAthena
diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h
index 983fd67a..cddace55 100644
--- a/src/net/ea/buysellhandler.h
+++ b/src/net/ea/buysellhandler.h
@@ -24,6 +24,8 @@
 
 #include "net/messagehandler.h"
 
+namespace EAthena {
+
 class BuySellHandler : public MessageHandler
 {
     public:
@@ -32,4 +34,6 @@ class BuySellHandler : public MessageHandler
         virtual void handleMessage(MessageIn &msg);
 };
 
+} // namespace EAthena
+
 #endif // NET_EA_BUYSELLHANDLER_H
diff --git a/src/net/ea/equipmenthandler.cpp b/src/net/ea/equipmenthandler.cpp
index d30b2681..0df0b31e 100644
--- a/src/net/ea/equipmenthandler.cpp
+++ b/src/net/ea/equipmenthandler.cpp
@@ -35,6 +35,8 @@
 
 #include "utils/gettext.h"
 
+namespace EAthena {
+
 enum { debugEquipment = 1 };
 
 EquipmentHandler::EquipmentHandler()
@@ -205,3 +207,5 @@ void EquipmentHandler::handleMessage(MessageIn &msg)
             break;
     }
 }
+
+} // namespace EAthena
diff --git a/src/net/ea/equipmenthandler.h b/src/net/ea/equipmenthandler.h
index afac0c30..852be3c9 100644
--- a/src/net/ea/equipmenthandler.h
+++ b/src/net/ea/equipmenthandler.h
@@ -24,6 +24,8 @@
 
 #include "net/messagehandler.h"
 
+namespace EAthena {
+
 class EquipmentHandler : public MessageHandler
 {
     public:
@@ -32,4 +34,6 @@ class EquipmentHandler : public MessageHandler
         virtual void handleMessage(MessageIn &msg);
 };
 
+} // namespace EAthena
+
 #endif // NET_EA_EQUIPMENTHANDLER_H
diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp
index 427b29bd..95d480f9 100644
--- a/src/net/ea/itemhandler.cpp
+++ b/src/net/ea/itemhandler.cpp
@@ -28,6 +28,8 @@
 #include "engine.h"
 #include "flooritemmanager.h"
 
+namespace EAthena {
+
 ItemHandler::ItemHandler()
 {
     static const Uint16 _messages[] = {
@@ -67,3 +69,5 @@ void ItemHandler::handleMessage(MessageIn &msg)
             break;
     }
 }
+
+} // namespace EAthena
diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h
index 412d8783..f72e4779 100644
--- a/src/net/ea/itemhandler.h
+++ b/src/net/ea/itemhandler.h
@@ -24,6 +24,8 @@
 
 #include "net/messagehandler.h"
 
+namespace EAthena {
+
 class ItemHandler : public MessageHandler
 {
     public:
@@ -32,4 +34,6 @@ class ItemHandler : public MessageHandler
         virtual void handleMessage(MessageIn &msg);
 };
 
+} // namespace EAthena
+
 #endif // NET_EA_ITEMHANDLER_H
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index c1d625f5..625f233a 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -37,7 +37,9 @@
 #include "utils/strprintf.h"
 
 PartyTab *partyTab = 0;
-PartyHandler *partyHandler = 0;
+Net::PartyHandler *partyHandler = 0;
+
+namespace EAthena {
 
 PartyHandler::PartyHandler()
 {
@@ -261,3 +263,5 @@ void PartyHandler::requestPartyMembers()
 {
     // Our eAthena doesn't have this message
 }
+
+} // namespace EAthena
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 41338c96..aaebe353 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -26,6 +26,8 @@
 #include "net/net.h"
 #include "net/partyhandler.h"
 
+namespace EAthena {
+
 class PartyHandler : public MessageHandler, public Net::PartyHandler
 {
     public:
@@ -54,6 +56,6 @@ class PartyHandler : public MessageHandler, public Net::PartyHandler
         void requestPartyMembers();
 };
 
-extern PartyHandler *partyHandler;
+} // namespace EAthena
 
 #endif // NET_EA_PARTYHANDLER_H