Core: ported headers cleanup from master branch

3 files changed, 16 insertions, 14 deletions

diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp
index c03851fdbdf..030f1d170d8 100644
--- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp
+++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp
@@ -19,10 +19,11 @@
 #include "Common.h"
 #include "AchievementMgr.h"
 #include "CharacterDatabaseCleaner.h"
-#include "World.h"
-#include "Database/DatabaseEnv.h"
-#include "SpellMgr.h"
+#include "DatabaseEnv.h"
 #include "DBCStores.h"
+#include "Log.h"
+#include "SpellMgr.h"
+#include "World.h"
 
 void CharacterDatabaseCleaner::CleanDatabase()
 {
@@ -67,7 +68,7 @@ void CharacterDatabaseCleaner::CleanDatabase()
     TC_LOG_INFO("server.loading", ">> Cleaned character database in %u ms", GetMSTimeDiffToNow(oldMSTime));
 }
 
-void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table, bool (*check)(uint32))
+void CharacterDatabaseCleaner::CheckUnique(char const* column, char const* table, bool (*check)(uint32))
 {
     QueryResult result = CharacterDatabase.PQuery("SELECT DISTINCT %s FROM %s", column, table);
     if (!result)
diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.h b/src/server/game/Tools/CharacterDatabaseCleaner.h
index e6db1e54c8f..c43d5229bac 100644
--- a/src/server/game/Tools/CharacterDatabaseCleaner.h
+++ b/src/server/game/Tools/CharacterDatabaseCleaner.h
@@ -32,7 +32,7 @@ namespace CharacterDatabaseCleaner
 
     TC_GAME_API void CleanDatabase();
 
-    TC_GAME_API void CheckUnique(const char* column, const char* table, bool (*check)(uint32));
+    TC_GAME_API void CheckUnique(char const* column, char const* table, bool (*check)(uint32));
 
     TC_GAME_API bool AchievementProgressCheck(uint32 criteria);
     TC_GAME_API bool SkillCheck(uint32 skill);
diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp
index e4bf6b2a171..0357fcc4e15 100644
--- a/src/server/game/Tools/PlayerDump.cpp
+++ b/src/server/game/Tools/PlayerDump.cpp
@@ -16,14 +16,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Common.h"
 #include "PlayerDump.h"
+#include "AccountMgr.h"
+#include "CharacterCache.h"
+#include "Common.h"
 #include "DatabaseEnv.h"
-#include "UpdateFields.h"
+#include "Log.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "AccountMgr.h"
-#include "CharacterCache.h"
+#include "UpdateFields.h"
 #include "World.h"
 
 // static data
@@ -414,7 +415,7 @@ inline std::string GetTableName(std::string const& str)
 {
     // length of "INSERT INTO `"
     static std::string::size_type const s = 13;
-    std::string::size_type e = str.find(_TABLE_SIM_, s);
+    std::string::size_type e = str.find('`', s);
     if (e == std::string::npos)
         return "";
 
@@ -437,7 +438,7 @@ inline bool ValidateFields(TableStruct const& ts, std::string const& str, size_t
     s += 4;
 
     std::string::size_type valPos = str.find("VALUES ('");
-    std::string::size_type e = str.find(_TABLE_SIM_, s);
+    std::string::size_type e = str.find('`', s);
     if (e == std::string::npos || valPos == std::string::npos)
     {
         TC_LOG_ERROR("misc", "LoadPlayerDump: (line " UI64FMTD ") unexpected end of line", lineNumber);
@@ -456,7 +457,7 @@ inline bool ValidateFields(TableStruct const& ts, std::string const& str, size_t
 
         // length of "`, `"
         s = e + 4;
-        e = str.find(_TABLE_SIM_, s);
+        e = str.find('`', s);
     } while (e < valPos);
 
     return true;
@@ -518,10 +519,10 @@ inline void AppendTableDump(StringTransaction& trans, TableStruct const& tableSt
     do
     {
         std::ostringstream ss;
-        ss << "INSERT INTO " << _TABLE_SIM_ << tableStruct.TableName << _TABLE_SIM_ << " (";
+        ss << "INSERT INTO `" << tableStruct.TableName << "` (";
         for (auto itr = tableStruct.TableFields.begin(); itr != tableStruct.TableFields.end();)
         {
-            ss << _TABLE_SIM_ << itr->FieldName << _TABLE_SIM_;
+            ss << '`' << itr->FieldName << '`';
             ++itr;
 
             if (itr != tableStruct.TableFields.end())