Namespaced the manaserv protocol to ease the porting of the enums.

Trivial.

6 files changed, 12 insertions, 0 deletions

diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp
index ab3fad21..22deafa3 100644
--- a/src/account-server/accounthandler.cpp
+++ b/src/account-server/accounthandler.cpp
@@ -44,6 +44,8 @@
 #include "utils/string.h"
 #include "utils/xml.h"
 
+using namespace ManaServ;
+
 /**
  * Adds server specific info to the current message
  *
diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp
index b41a4417..1fd574ca 100644
--- a/src/account-server/serverhandler.cpp
+++ b/src/account-server/serverhandler.cpp
@@ -39,6 +39,8 @@
 #include "utils/tokendispenser.h"
 #include "manaserv_protocol.h"
 
+using namespace ManaServ;
+
 struct MapStatistics
 {
   std::vector< int > players;
diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index 60474f92..8723ec8b 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -39,6 +39,8 @@
 #include "utils/stringfilter.h"
 #include "utils/tokendispenser.h"
 
+using namespace ManaServ;
+
 void registerChatClient(const std::string &token,
                         const std::string &name,
                         int level)
diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp
index 4f332cdd..7e7783dd 100644
--- a/src/chat-server/guildhandler.cpp
+++ b/src/chat-server/guildhandler.cpp
@@ -32,6 +32,7 @@
 #include "net/messageout.h"
 
 #include "manaserv_protocol.h"
+using namespace ManaServ;
 
 void ChatHandler::sendGuildInvite(const std::string &invitedName,
                                   const std::string &inviterName,
diff --git a/src/game-server/thing.h b/src/game-server/thing.h
index 508d7529..437980bd 100644
--- a/src/game-server/thing.h
+++ b/src/game-server/thing.h
@@ -22,6 +22,7 @@
 #define THING_H
 
 #include "manaserv_protocol.h"
+using namespace ManaServ;
 
 #include <set>
 
diff --git a/src/manaserv_protocol.h b/src/manaserv_protocol.h
index b592f548..da95207c 100644
--- a/src/manaserv_protocol.h
+++ b/src/manaserv_protocol.h
@@ -22,6 +22,8 @@
 #ifndef MANASERV_PROTOCOL_H
 #define MANASERV_PROTOCOL_H
 
+namespace ManaServ {
+
 /**
  * Enumerated type for communicated messages:
  *
@@ -436,4 +438,6 @@ enum SpriteLayer
     SPRITE_VECTOREND
 };
 
+}; // Namespace ManaServ
+
 #endif // MANASERV_PROTOCOL_H