AccountMgr singleton converted to namespace with free functions as it has no internal state

1 files changed, 3 insertions, 9 deletions

diff --git a/src/server/game/Accounts/AccountMgr.h b/src/server/game/Accounts/AccountMgr.h
index 3eaa0df93b3..79f87dbfa2d 100755
--- a/src/server/game/Accounts/AccountMgr.h
+++ b/src/server/game/Accounts/AccountMgr.h
@@ -19,10 +19,9 @@
 #ifndef _ACCMGR_H
 #define _ACCMGR_H
 
+#include "Define.h"
 #include <string>
 
-#include "Common.h"
-
 enum AccountOpResult
 {
     AOR_OK,
@@ -35,12 +34,8 @@ enum AccountOpResult
 
 #define MAX_ACCOUNT_STR 16
 
-class AccountMgr
+namespace AccountMgr
 {
-    public:
-        AccountMgr();
-        ~AccountMgr();
-
         AccountOpResult CreateAccount(std::string username, std::string password);
         AccountOpResult DeleteAccount(uint32 accountId);
         AccountOpResult ChangeUsername(uint32 accountId, std::string newUsername, std::string newPassword);
@@ -54,8 +49,7 @@ class AccountMgr
         uint32 GetCharactersCount(uint32 accountId);
         std::string CalculateShaPassHash(std::string& name, std::string& password);
 
-        static bool normalizeString(std::string& utf8String);
+        bool normalizeString(std::string& utf8String);
 };
 
-#define sAccountMgr ACE_Singleton<AccountMgr, ACE_Null_Mutex>::instance()
 #endif