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, 39 insertions, 0 deletions

diff --git a/src/net/tmwserv/beinghandler.cpp b/src/net/tmwserv/beinghandler.cpp
index 292a3e3f..581640db 100644
--- a/src/net/tmwserv/beinghandler.cpp
+++ b/src/net/tmwserv/beinghandler.cpp
@@ -41,6 +41,8 @@
 
 #include "net/tmwserv/gameserver/player.h"
 
+namespace TmwServ {
+
 BeingHandler::BeingHandler()
 {
     static const Uint16 _messages[] = {
@@ -359,3 +361,5 @@ void BeingHandler::handleBeingDirChangeMessage(MessageIn &msg)
        case DIRECTION_RIGHT: being->setDirection(Being::RIGHT); break;
     }
 }
+
+} // namespace TmwServ
diff --git a/src/net/tmwserv/beinghandler.h b/src/net/tmwserv/beinghandler.h
index 0ca186f0..77a329a2 100644
--- a/src/net/tmwserv/beinghandler.h
+++ b/src/net/tmwserv/beinghandler.h
@@ -24,6 +24,8 @@
 
 #include "net/messagehandler.h"
 
+namespace TmwServ {
+
 class BeingHandler : public MessageHandler
 {
     public:
@@ -42,4 +44,6 @@ class BeingHandler : public MessageHandler
         void handleBeingDirChangeMessage(MessageIn &msg);
 };
 
+} // namespace TmwServ
+
 #endif
diff --git a/src/net/tmwserv/buysellhandler.cpp b/src/net/tmwserv/buysellhandler.cpp
index e6943ee0..87a583ec 100644
--- a/src/net/tmwserv/buysellhandler.cpp
+++ b/src/net/tmwserv/buysellhandler.cpp
@@ -38,6 +38,8 @@ extern BuyDialog *buyDialog;
 extern SellDialog *sellDialog;
 extern Window *buySellDialog;
 
+namespace TmwServ {
+
 BuySellHandler::BuySellHandler()
 {
     static const Uint16 _messages[] = {
@@ -89,3 +91,5 @@ void BuySellHandler::handleMessage(MessageIn &msg)
             break;
     }
 }
+
+} // namespace TmwServ
diff --git a/src/net/tmwserv/buysellhandler.h b/src/net/tmwserv/buysellhandler.h
index 32f273f1..08f89015 100644
--- a/src/net/tmwserv/buysellhandler.h
+++ b/src/net/tmwserv/buysellhandler.h
@@ -24,6 +24,8 @@
 
 #include "net/messagehandler.h"
 
+namespace TmwServ {
+
 class BuySellHandler : public MessageHandler
 {
     public:
@@ -32,4 +34,6 @@ class BuySellHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
+} // namespace TmwServ
+
 #endif
diff --git a/src/net/tmwserv/effecthandler.cpp b/src/net/tmwserv/effecthandler.cpp
index 787a7a68..34da9c7d 100644
--- a/src/net/tmwserv/effecthandler.cpp
+++ b/src/net/tmwserv/effecthandler.cpp
@@ -27,6 +27,7 @@
 
 #include "effectmanager.h"
 
+namespace TmwServ {
 
 EffectHandler::EffectHandler()
 {
@@ -56,3 +57,5 @@ void EffectHandler::handleCreateEffects(MessageIn &msg)
      Uint16 y = msg.readInt16();
      effectManager->trigger(id, x, y);
 }
+
+} // namespace TmwServ
diff --git a/src/net/tmwserv/effecthandler.h b/src/net/tmwserv/effecthandler.h
index 894ad1c8..05638cad 100644
--- a/src/net/tmwserv/effecthandler.h
+++ b/src/net/tmwserv/effecthandler.h
@@ -24,6 +24,8 @@
 
 #include "net/messagehandler.h"
 
+namespace TmwServ {
+
 class EffectHandler : public MessageHandler
 {
     public:
@@ -35,4 +37,6 @@ class EffectHandler : public MessageHandler
         void handleCreateEffects(MessageIn &msg);
 };
 
+} // namespace TmwServ
+
 #endif
diff --git a/src/net/tmwserv/guildhandler.cpp b/src/net/tmwserv/guildhandler.cpp
index 21b43063..92057e6e 100644
--- a/src/net/tmwserv/guildhandler.cpp
+++ b/src/net/tmwserv/guildhandler.cpp
@@ -39,6 +39,8 @@
 
 #include <iostream>
 
+namespace TmwServ {
+
 GuildHandler::GuildHandler()
 {
     static const Uint16 _messages[] = {
@@ -241,3 +243,5 @@ void GuildHandler::joinedGuild(MessageIn &msg)
     channelManager->addChannel(channel);
     channel->getTab()->chatLog("Topic: " + announcement, BY_CHANNEL);
 }
+
+} // namespace TmwServ
diff --git a/src/net/tmwserv/guildhandler.h b/src/net/tmwserv/guildhandler.h
index 9b900d9f..2178a19e 100644
--- a/src/net/tmwserv/guildhandler.h
+++ b/src/net/tmwserv/guildhandler.h
@@ -26,6 +26,8 @@
 
 #include <string>
 
+namespace TmwServ {
+
 class GuildHandler : public MessageHandler
 {
 public:
@@ -37,4 +39,6 @@ protected:
     void joinedGuild(MessageIn &msg);
 };
 
+} // namespace TmwServ
+
 #endif
diff --git a/src/net/tmwserv/itemhandler.cpp b/src/net/tmwserv/itemhandler.cpp
index 4ed61266..423ce192 100644
--- a/src/net/tmwserv/itemhandler.cpp
+++ b/src/net/tmwserv/itemhandler.cpp
@@ -28,6 +28,8 @@
 #include "engine.h"
 #include "flooritemmanager.h"
 
+namespace TmwServ {
+
 ItemHandler::ItemHandler()
 {
     static const Uint16 _messages[] = {
@@ -64,3 +66,5 @@ void ItemHandler::handleMessage(MessageIn &msg)
         } break;
     }
 }
+
+} // namespace TmwServ
diff --git a/src/net/tmwserv/itemhandler.h b/src/net/tmwserv/itemhandler.h
index 6a2a96c8..d1d24d43 100644
--- a/src/net/tmwserv/itemhandler.h
+++ b/src/net/tmwserv/itemhandler.h
@@ -24,6 +24,8 @@
 
 #include "net/messagehandler.h"
 
+namespace TmwServ {
+
 class ItemHandler : public MessageHandler
 {
     public:
@@ -32,4 +34,6 @@ class ItemHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 };
 
+} // namespace TmwServ
+
 #endif