From 46010fbfdf4bead4715b72fad19e0f8ea27f5927 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Wed, 21 Jan 2015 19:04:13 -0600 Subject: [PATCH] Rename LoadLogSysSettings to LoadLogSettings --- client_files/export/main.cpp | 2 +- client_files/import/main.cpp | 2 +- common/database.cpp | 2 +- common/database.h | 2 +- queryserv/database.cpp | 2 +- queryserv/database.h | 2 +- queryserv/queryserv.cpp | 2 +- shared_memory/main.cpp | 2 +- ucs/database.cpp | 2 +- ucs/database.h | 2 +- ucs/ucs.cpp | 2 +- world/net.cpp | 2 +- world/zoneserver.cpp | 2 +- zone/net.cpp | 2 +- zone/worldserver.cpp | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/client_files/export/main.cpp b/client_files/export/main.cpp index 10c4e0ca9..865fbd6d8 100644 --- a/client_files/export/main.cpp +++ b/client_files/export/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char **argv) { } /* Register Log System and Settings */ - database.LoadLogSysSettings(Log.log_settings); + database.LoadLogSettings(Log.log_settings); Log.StartFileLogs(); ExportSpells(&database); diff --git a/client_files/import/main.cpp b/client_files/import/main.cpp index 7e12b2fa2..a8477f77a 100644 --- a/client_files/import/main.cpp +++ b/client_files/import/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char **argv) { return 1; } - database.LoadLogSysSettings(Log.log_settings); + database.LoadLogSettings(Log.log_settings); Log.StartFileLogs(); ImportSpells(&database); diff --git a/common/database.cpp b/common/database.cpp index 129fa2859..e336de437 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -4159,7 +4159,7 @@ uint32 Database::GetGuildIDByCharID(uint32 char_id) return atoi(row[0]); } -void Database::LoadLogSysSettings(EQEmuLogSys::LogSettings* log_settings){ +void Database::LoadLogSettings(EQEmuLogSys::LogSettings* log_settings){ std::string query = "SELECT " "log_category_id, " diff --git a/common/database.h b/common/database.h index e6515c5f6..8bea5b83c 100644 --- a/common/database.h +++ b/common/database.h @@ -646,7 +646,7 @@ public: void AddReport(std::string who, std::string against, std::string lines); /* EQEmuLogSys */ - void LoadLogSysSettings(EQEmuLogSys::LogSettings* log_settings); + void LoadLogSettings(EQEmuLogSys::LogSettings* log_settings); private: void DBInitVars(); diff --git a/queryserv/database.cpp b/queryserv/database.cpp index 1a97ecfc2..e788c801c 100644 --- a/queryserv/database.cpp +++ b/queryserv/database.cpp @@ -364,7 +364,7 @@ void Database::GeneralQueryReceive(ServerPacket *pack) { safe_delete(queryBuffer); } -void Database::LoadLogSysSettings(EQEmuLogSys::LogSettings* log_settings){ +void Database::LoadLogSettings(EQEmuLogSys::LogSettings* log_settings){ std::string query = "SELECT " "log_category_id, " diff --git a/queryserv/database.h b/queryserv/database.h index 898e300c4..b2d32341b 100644 --- a/queryserv/database.h +++ b/queryserv/database.h @@ -52,7 +52,7 @@ public: void LogMerchantTransaction(QSMerchantLogTransaction_Struct* QS, uint32 Items); void GeneralQueryReceive(ServerPacket *pack); - void LoadLogSysSettings(EQEmuLogSys::LogSettings* log_settings); + void LoadLogSettings(EQEmuLogSys::LogSettings* log_settings); protected: void HandleMysqlError(uint32 errnum); diff --git a/queryserv/queryserv.cpp b/queryserv/queryserv.cpp index 485417a0f..4ce00ed4b 100644 --- a/queryserv/queryserv.cpp +++ b/queryserv/queryserv.cpp @@ -88,7 +88,7 @@ int main() { } /* Register Log System and Settings */ - database.LoadLogSysSettings(Log.log_settings); + database.LoadLogSettings(Log.log_settings); Log.StartFileLogs(); if (signal(SIGINT, CatchSignal) == SIG_ERR) { diff --git a/shared_memory/main.cpp b/shared_memory/main.cpp index 3ea29c47b..2623ccd26 100644 --- a/shared_memory/main.cpp +++ b/shared_memory/main.cpp @@ -58,7 +58,7 @@ int main(int argc, char **argv) { } /* Register Log System and Settings */ - database.LoadLogSysSettings(Log.log_settings); + database.LoadLogSettings(Log.log_settings); Log.StartFileLogs(); bool load_all = true; diff --git a/ucs/database.cpp b/ucs/database.cpp index a295880f2..75be71377 100644 --- a/ucs/database.cpp +++ b/ucs/database.cpp @@ -578,7 +578,7 @@ void Database::GetFriendsAndIgnore(int charID, std::vector &friends } -void Database::LoadLogSysSettings(EQEmuLogSys::LogSettings* log_settings){ +void Database::LoadLogSettings(EQEmuLogSys::LogSettings* log_settings){ std::string query = "SELECT " "log_category_id, " diff --git a/ucs/database.h b/ucs/database.h index a8c382982..ade93ef42 100644 --- a/ucs/database.h +++ b/ucs/database.h @@ -58,7 +58,7 @@ public: void AddFriendOrIgnore(int CharID, int Type, std::string Name); void RemoveFriendOrIgnore(int CharID, int Type, std::string Name); void GetFriendsAndIgnore(int CharID, std::vector &Friends, std::vector &Ignorees); - void LoadLogSysSettings(EQEmuLogSys::LogSettings* log_settings); + void LoadLogSettings(EQEmuLogSys::LogSettings* log_settings); protected: diff --git a/ucs/ucs.cpp b/ucs/ucs.cpp index 69a03c84e..b6beeb268 100644 --- a/ucs/ucs.cpp +++ b/ucs/ucs.cpp @@ -98,7 +98,7 @@ int main() { } /* Register Log System and Settings */ - database.LoadLogSysSettings(Log.log_settings); + database.LoadLogSettings(Log.log_settings); Log.StartFileLogs(); char tmp[64]; diff --git a/world/net.cpp b/world/net.cpp index ade37759e..12e3c4a3b 100644 --- a/world/net.cpp +++ b/world/net.cpp @@ -184,7 +184,7 @@ int main(int argc, char** argv) { guild_mgr.SetDatabase(&database); /* Register Log System and Settings */ - database.LoadLogSysSettings(Log.log_settings); + database.LoadLogSettings(Log.log_settings); Log.StartFileLogs(); if (argc >= 2) { diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index 51c07954e..65c80cac7 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -794,7 +794,7 @@ bool ZoneServer::Process() { } case ServerOP_ReloadLogs: { zoneserver_list.SendPacket(pack); - database.LoadLogSysSettings(Log.log_settings); + database.LoadLogSettings(Log.log_settings); break; } case ServerOP_ReloadRules: { diff --git a/zone/net.cpp b/zone/net.cpp index 5c74d209d..826db4ab8 100644 --- a/zone/net.cpp +++ b/zone/net.cpp @@ -168,7 +168,7 @@ int main(int argc, char** argv) { /* Register Log System and Settings */ Log.OnLogHookCallBackZone(&Zone::GMSayHookCallBackProcess); - database.LoadLogSysSettings(Log.log_settings); + database.LoadLogSettings(Log.log_settings); Log.StartFileLogs(); /* Guilds */ diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index ac5899638..e3cee409b 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -1749,7 +1749,7 @@ void WorldServer::Process() { break; } case ServerOP_ReloadLogs: { - database.LoadLogSysSettings(Log.log_settings); + database.LoadLogSettings(Log.log_settings); break; } case ServerOP_CameraShake: