From 2af5f99fffc8cc47fbc4edc05362036d29a4ccc3 Mon Sep 17 00:00:00 2001 From: brainiac Date: Thu, 18 Dec 2025 01:03:02 -0800 Subject: [PATCH] normalize includes: loginserver --- loginserver/account_management.cpp | 3 +++ loginserver/account_management.h | 3 ++- loginserver/client.h | 20 ++++++++------------ loginserver/client_manager.h | 1 - loginserver/encryption.h | 2 +- loginserver/login_server.h | 3 --- loginserver/loginserver_webserver.h | 1 - loginserver/main.cpp | 7 +------ loginserver/world_server.h | 1 - loginserver/world_server_manager.cpp | 3 +-- loginserver/world_server_manager.h | 1 - 11 files changed, 16 insertions(+), 29 deletions(-) diff --git a/loginserver/account_management.cpp b/loginserver/account_management.cpp index 314fb4492..d7e85072b 100644 --- a/loginserver/account_management.cpp +++ b/loginserver/account_management.cpp @@ -1,7 +1,10 @@ #include "account_management.h" +#include "common/event/event_loop.h" #include "common/event/task_scheduler.h" +#include "common/net/dns.h" #include "common/repositories/login_accounts_repository.h" +#include "common/types.h" #include "loginserver/login_server.h" EQ::Event::TaskScheduler task_runner; diff --git a/loginserver/account_management.h b/loginserver/account_management.h index 7f23c8775..3a0edc5e6 100644 --- a/loginserver/account_management.h +++ b/loginserver/account_management.h @@ -2,9 +2,10 @@ #include "common/types.h" #include "loginserver/login_types.h" -#include "loginserver/encryption.h" #include "loginserver/login_server.h" +#include + extern LoginServer server; extern Database database; diff --git a/loginserver/client.h b/loginserver/client.h index 75d972f92..5baa4eebe 100644 --- a/loginserver/client.h +++ b/loginserver/client.h @@ -1,13 +1,12 @@ -#ifndef EQEMU_CLIENT_H -#define EQEMU_CLIENT_H +#pragma once + +#include "common/eq_stream_intf.h" +#include "common/net/reliable_stream_connection.h" +#include "common/opcodemgr.h" +#include "common/random.h" +#include "common/repositories/login_accounts_repository.h" +#include "loginserver/login_types.h" -#include "../common/opcodemgr.h" -#include "../common/random.h" -#include "../common/eq_stream_intf.h" -#include "../common/net/dns.h" -#include "../common/net/reliable_stream_connection.h" -#include "login_types.h" -#include "../common/repositories/login_accounts_repository.h" #include class Client { @@ -62,6 +61,3 @@ private: return username == "healthcheckuser"; } }; - -#endif - diff --git a/loginserver/client_manager.h b/loginserver/client_manager.h index 3171fdcca..c98313fbf 100644 --- a/loginserver/client_manager.h +++ b/loginserver/client_manager.h @@ -1,7 +1,6 @@ #pragma once #include "common/net/eqstream.h" -#include "common/opcodemgr.h" #include "loginserver/client.h" #include diff --git a/loginserver/encryption.h b/loginserver/encryption.h index 0ebb3e1fd..b4b9242ab 100644 --- a/loginserver/encryption.h +++ b/loginserver/encryption.h @@ -41,7 +41,7 @@ struct EncryptionResult { std::string mode_name; }; -static EncryptionResult EncryptPasswordFromContext(LoginAccountContext c, int mode = EncryptionModeSCrypt) +inline EncryptionResult EncryptPasswordFromContext(LoginAccountContext c, int mode = EncryptionModeSCrypt) { if (mode == 0) { LogError("Encryption mode not set!"); diff --git a/loginserver/login_server.h b/loginserver/login_server.h index 0602ba528..4d006ac7b 100644 --- a/loginserver/login_server.h +++ b/loginserver/login_server.h @@ -2,13 +2,10 @@ #include "common/json_config.h" #include "loginserver/client_manager.h" -#include "loginserver/encryption.h" #include "loginserver/loginserver_webserver.h" #include "loginserver/options.h" #include "loginserver/world_server_manager.h" -#include - struct LoginServer { public: diff --git a/loginserver/loginserver_webserver.h b/loginserver/loginserver_webserver.h index dba59824c..18972cbcb 100644 --- a/loginserver/loginserver_webserver.h +++ b/loginserver/loginserver_webserver.h @@ -2,7 +2,6 @@ #include "common/http/httplib.h" #include "common/json/json.h" -#include "common/types.h" namespace LoginserverWebserver { diff --git a/loginserver/main.cpp b/loginserver/main.cpp index 636118d02..2aae37528 100644 --- a/loginserver/main.cpp +++ b/loginserver/main.cpp @@ -2,24 +2,19 @@ #include "common/database.h" #include "common/eqemu_logsys.h" #include "common/event/event_loop.h" +#include "common/event/timer.h" #include "common/events/player_event_logs.h" #include "common/http/httplib.h" -#include "common/opcodemgr.h" #include "common/path_manager.h" #include "common/platform.h" -#include "common/strings.h" #include "common/timer.h" #include "common/types.h" -#include "common/zone_store.h" #include "loginserver/login_server.h" #include "loginserver/loginserver_command_handler.h" #include "loginserver/loginserver_webserver.h" -#include -#include #include #include -#include LoginServer server; bool run_server = true; diff --git a/loginserver/world_server.h b/loginserver/world_server.h index 5cd504310..94ed4b4a7 100644 --- a/loginserver/world_server.h +++ b/loginserver/world_server.h @@ -1,6 +1,5 @@ #pragma once -#include "common/event/timer.h" #include "common/net/servertalk_server_connection.h" #include "common/packet_dump.h" #include "common/repositories/login_server_admins_repository.h" diff --git a/loginserver/world_server_manager.cpp b/loginserver/world_server_manager.cpp index 9c1219071..fdf917e7e 100644 --- a/loginserver/world_server_manager.cpp +++ b/loginserver/world_server_manager.cpp @@ -3,9 +3,8 @@ #include "common/eqemu_logsys.h" #include "common/ip_util.h" #include "loginserver/login_server.h" -#include "loginserver/login_types.h" -#include +#include extern LoginServer server; extern bool run_server; diff --git a/loginserver/world_server_manager.h b/loginserver/world_server_manager.h index 6ed6ed96c..1885b1669 100644 --- a/loginserver/world_server_manager.h +++ b/loginserver/world_server_manager.h @@ -2,7 +2,6 @@ #include "common/net/servertalk_server.h" #include "common/packet_dump.h" -#include "common/servertalk.h" #include "loginserver/client.h" #include "loginserver/world_server.h"