From dbb9ee477ce0e9509cd33d2b3c717955868e63e2 Mon Sep 17 00:00:00 2001 From: i0gan <42000708+i0gan@users.noreply.github.com> Date: Sat, 27 Apr 2024 18:46:45 +0800 Subject: [PATCH] Format: Google Style code format --- config/plugin/db_proxy.xml | 17 ++++++++-------- config/plugin/ds_mgr.xml | 7 +++---- config/plugin/game.xml | 9 ++++----- config/plugin/login.xml | 1 - config/plugin/master.xml | 7 +++---- config/plugin/player.xml | 25 ++++++++++++------------ config/plugin/sqkcli.xml | 13 ++++++------ config/plugin/tutorial/t1_plugin.xml | 6 +++--- config/plugin/tutorial/t2_property.xml | 6 +++--- config/plugin/tutorial/t5_http.xml | 1 - config/plugin/tutorial/t6_rpc.xml | 1 - config/plugin/web.xml | 10 ++++------ config/plugin/world.xml | 15 +++++++------- src/node/db_proxy/logic/i_logic_module.h | 3 +-- src/node/db_proxy/logic/logic_module.cc | 4 ++-- src/node/db_proxy/logic/logic_module.h | 1 + src/node/db_proxy/logic/plugin.cc | 8 ++------ src/node/game/logic/i_game_mgr_module.h | 2 +- src/node/global/logic/i_logic_module.h | 3 +-- src/node/global/logic/logic_module.cc | 4 ++-- src/node/global/logic/logic_module.h | 1 + src/node/global/logic/plugin.cc | 8 ++------ src/node/login/logic/logic_module.h | 2 +- src/node/master/logic/logic_module.h | 1 - src/node/player/logic/logic_module.h | 1 - src/node/proxy/logic/logic_module.cc | 2 +- src/node/proxy/logic/logic_module.h | 2 +- src/node/world/logic/i_logic_module.h | 3 +-- src/node/world/logic/logic_module.cc | 4 ++-- src/node/world/logic/logic_module.h | 1 + src/node/world/logic/plugin.cc | 8 ++------ src/squick/plugin/node/i_node_module.h | 2 +- 32 files changed, 76 insertions(+), 102 deletions(-) diff --git a/config/plugin/db_proxy.xml b/config/plugin/db_proxy.xml index 02ebdb25..8372ad3e 100644 --- a/config/plugin/db_proxy.xml +++ b/config/plugin/db_proxy.xml @@ -1,13 +1,12 @@ - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/config/plugin/ds_mgr.xml b/config/plugin/ds_mgr.xml index d09a890e..e0d01c6a 100644 --- a/config/plugin/ds_mgr.xml +++ b/config/plugin/ds_mgr.xml @@ -1,9 +1,8 @@ - - + + - - + \ No newline at end of file diff --git a/config/plugin/game.xml b/config/plugin/game.xml index 1ba97360..c860891d 100644 --- a/config/plugin/game.xml +++ b/config/plugin/game.xml @@ -1,9 +1,8 @@ - - - + + + - - + \ No newline at end of file diff --git a/config/plugin/login.xml b/config/plugin/login.xml index 807ad441..f8aa994f 100644 --- a/config/plugin/login.xml +++ b/config/plugin/login.xml @@ -3,7 +3,6 @@ - diff --git a/config/plugin/master.xml b/config/plugin/master.xml index edf59d04..2874b45d 100644 --- a/config/plugin/master.xml +++ b/config/plugin/master.xml @@ -1,9 +1,8 @@ - - + + - - + \ No newline at end of file diff --git a/config/plugin/player.xml b/config/plugin/player.xml index d69ad47d..b6ac8108 100644 --- a/config/plugin/player.xml +++ b/config/plugin/player.xml @@ -1,15 +1,14 @@ - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/config/plugin/sqkcli.xml b/config/plugin/sqkcli.xml index da063313..692294fa 100644 --- a/config/plugin/sqkcli.xml +++ b/config/plugin/sqkcli.xml @@ -1,9 +1,8 @@ - - - - - - - + + + + + + \ No newline at end of file diff --git a/config/plugin/tutorial/t1_plugin.xml b/config/plugin/tutorial/t1_plugin.xml index 781532ee..56fd216e 100644 --- a/config/plugin/tutorial/t1_plugin.xml +++ b/config/plugin/tutorial/t1_plugin.xml @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/config/plugin/tutorial/t2_property.xml b/config/plugin/tutorial/t2_property.xml index 978ce44b..179142d1 100644 --- a/config/plugin/tutorial/t2_property.xml +++ b/config/plugin/tutorial/t2_property.xml @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/config/plugin/tutorial/t5_http.xml b/config/plugin/tutorial/t5_http.xml index c5ab0149..5ba15c78 100644 --- a/config/plugin/tutorial/t5_http.xml +++ b/config/plugin/tutorial/t5_http.xml @@ -2,7 +2,6 @@ - \ No newline at end of file diff --git a/config/plugin/tutorial/t6_rpc.xml b/config/plugin/tutorial/t6_rpc.xml index b7f43e3c..487769fe 100644 --- a/config/plugin/tutorial/t6_rpc.xml +++ b/config/plugin/tutorial/t6_rpc.xml @@ -2,7 +2,6 @@ - \ No newline at end of file diff --git a/config/plugin/web.xml b/config/plugin/web.xml index 13cf250c..825e0f07 100644 --- a/config/plugin/web.xml +++ b/config/plugin/web.xml @@ -1,10 +1,8 @@ - - + + - - - - + + \ No newline at end of file diff --git a/config/plugin/world.xml b/config/plugin/world.xml index 3d21892f..d079557f 100644 --- a/config/plugin/world.xml +++ b/config/plugin/world.xml @@ -1,14 +1,13 @@ - - - + + + - + - + - - - + + \ No newline at end of file diff --git a/src/node/db_proxy/logic/i_logic_module.h b/src/node/db_proxy/logic/i_logic_module.h index 78205d29..93a3acd2 100644 --- a/src/node/db_proxy/logic/i_logic_module.h +++ b/src/node/db_proxy/logic/i_logic_module.h @@ -2,7 +2,6 @@ #include namespace db_proxy::logic { -class ILogicModule : public IModule { -}; +class ILogicModule : public IModule {}; } // namespace db_proxy::logic diff --git a/src/node/db_proxy/logic/logic_module.cc b/src/node/db_proxy/logic/logic_module.cc index 212cf4c1..c1cb73b7 100644 --- a/src/node/db_proxy/logic/logic_module.cc +++ b/src/node/db_proxy/logic/logic_module.cc @@ -3,8 +3,8 @@ namespace db_proxy::logic { bool LogicModule::Start() { m_node_ = pm_->FindModule(); - vector node_types = { }; + vector node_types = {}; m_node_->AddSubscribeNode(node_types); return true; } -} \ No newline at end of file +} // namespace db_proxy::logic \ No newline at end of file diff --git a/src/node/db_proxy/logic/logic_module.h b/src/node/db_proxy/logic/logic_module.h index b9eb7112..125a57a9 100644 --- a/src/node/db_proxy/logic/logic_module.h +++ b/src/node/db_proxy/logic/logic_module.h @@ -11,6 +11,7 @@ class LogicModule : public ILogicModule { is_update_ = true; // Update } virtual bool Start() override; + private: INodeModule *m_node_; }; diff --git a/src/node/db_proxy/logic/plugin.cc b/src/node/db_proxy/logic/plugin.cc index b4959bbb..0fd0571e 100644 --- a/src/node/db_proxy/logic/plugin.cc +++ b/src/node/db_proxy/logic/plugin.cc @@ -11,12 +11,8 @@ const int Plugin::GetPluginVersion() { return 0; } const std::string Plugin::GetPluginName() { return GET_CLASS_NAME(Plugin); } -void Plugin::Install() { - REGISTER_MODULE(pm_, ILogicModule, LogicModule) -} +void Plugin::Install() { REGISTER_MODULE(pm_, ILogicModule, LogicModule) } -void Plugin::Uninstall() { - UNREGISTER_MODULE(pm_, ILogicModule, LogicModule) -} +void Plugin::Uninstall() { UNREGISTER_MODULE(pm_, ILogicModule, LogicModule) } } // namespace db_proxy::logic \ No newline at end of file diff --git a/src/node/game/logic/i_game_mgr_module.h b/src/node/game/logic/i_game_mgr_module.h index eaefb9e4..91d6de0f 100644 --- a/src/node/game/logic/i_game_mgr_module.h +++ b/src/node/game/logic/i_game_mgr_module.h @@ -3,10 +3,10 @@ #include #include -#include #include #include #include +#include namespace game::logic { diff --git a/src/node/global/logic/i_logic_module.h b/src/node/global/logic/i_logic_module.h index 58dd537e..239669e6 100644 --- a/src/node/global/logic/i_logic_module.h +++ b/src/node/global/logic/i_logic_module.h @@ -2,7 +2,6 @@ #include namespace global::logic { -class ILogicModule : public IModule { -}; +class ILogicModule : public IModule {}; } // namespace global::logic diff --git a/src/node/global/logic/logic_module.cc b/src/node/global/logic/logic_module.cc index 7d799656..0e5131f0 100644 --- a/src/node/global/logic/logic_module.cc +++ b/src/node/global/logic/logic_module.cc @@ -3,8 +3,8 @@ namespace global::logic { bool LogicModule::Start() { m_node_ = pm_->FindModule(); - vector node_types = { ServerType::ST_DB_PROXY }; + vector node_types = {ServerType::ST_DB_PROXY}; m_node_->AddSubscribeNode(node_types); return true; } -} \ No newline at end of file +} // namespace global::logic \ No newline at end of file diff --git a/src/node/global/logic/logic_module.h b/src/node/global/logic/logic_module.h index a2b746c2..146a494f 100644 --- a/src/node/global/logic/logic_module.h +++ b/src/node/global/logic/logic_module.h @@ -11,6 +11,7 @@ class LogicModule : public ILogicModule { is_update_ = true; // Update } virtual bool Start() override; + private: INodeModule *m_node_; }; diff --git a/src/node/global/logic/plugin.cc b/src/node/global/logic/plugin.cc index 7743dd54..ce2c0d5b 100644 --- a/src/node/global/logic/plugin.cc +++ b/src/node/global/logic/plugin.cc @@ -11,12 +11,8 @@ const int Plugin::GetPluginVersion() { return 0; } const std::string Plugin::GetPluginName() { return GET_CLASS_NAME(Plugin); } -void Plugin::Install() { - REGISTER_MODULE(pm_, ILogicModule, LogicModule) -} +void Plugin::Install() { REGISTER_MODULE(pm_, ILogicModule, LogicModule) } -void Plugin::Uninstall() { - UNREGISTER_MODULE(pm_, ILogicModule, LogicModule) -} +void Plugin::Uninstall() { UNREGISTER_MODULE(pm_, ILogicModule, LogicModule) } } // namespace global::logic \ No newline at end of file diff --git a/src/node/login/logic/logic_module.h b/src/node/login/logic/logic_module.h index 70ead666..f55d16b4 100644 --- a/src/node/login/logic/logic_module.h +++ b/src/node/login/logic/logic_module.h @@ -2,10 +2,10 @@ #include "i_logic_module.h" #include #include -#include #include #include #include +#include #include #include #include diff --git a/src/node/master/logic/logic_module.h b/src/node/master/logic/logic_module.h index 09f5f715..b68fc9bf 100644 --- a/src/node/master/logic/logic_module.h +++ b/src/node/master/logic/logic_module.h @@ -1,6 +1,5 @@ #pragma once - #include "i_logic_module.h" #include #include diff --git a/src/node/player/logic/logic_module.h b/src/node/player/logic/logic_module.h index e5270d99..5610d521 100644 --- a/src/node/player/logic/logic_module.h +++ b/src/node/player/logic/logic_module.h @@ -35,7 +35,6 @@ class LogicModule : public ILogicModule { private: ILuaScriptModule *m_lua_script_; INodeModule *m_node_; - }; } // namespace player::logic diff --git a/src/node/proxy/logic/logic_module.cc b/src/node/proxy/logic/logic_module.cc index c7e79a95..60288b09 100644 --- a/src/node/proxy/logic/logic_module.cc +++ b/src/node/proxy/logic/logic_module.cc @@ -60,7 +60,7 @@ bool LogicModule::AfterStart() { vector node_types = {ServerType::ST_WORLD, ServerType::ST_LOGIN, ServerType::ST_PLAYER}; m_node_->AddSubscribeNode(node_types); - + return true; } diff --git a/src/node/proxy/logic/logic_module.h b/src/node/proxy/logic/logic_module.h index 06b30141..dd9c8267 100644 --- a/src/node/proxy/logic/logic_module.h +++ b/src/node/proxy/logic/logic_module.h @@ -4,8 +4,8 @@ #include #include #include -#include #include +#include #include "i_logic_module.h" #include diff --git a/src/node/world/logic/i_logic_module.h b/src/node/world/logic/i_logic_module.h index 83a1e6e8..62321533 100644 --- a/src/node/world/logic/i_logic_module.h +++ b/src/node/world/logic/i_logic_module.h @@ -2,7 +2,6 @@ #include namespace world::logic { -class ILogicModule : public IModule { -}; +class ILogicModule : public IModule {}; } // namespace world::logic diff --git a/src/node/world/logic/logic_module.cc b/src/node/world/logic/logic_module.cc index a7aebb89..91a1b7de 100644 --- a/src/node/world/logic/logic_module.cc +++ b/src/node/world/logic/logic_module.cc @@ -3,8 +3,8 @@ namespace world::logic { bool LogicModule::Start() { m_node_ = pm_->FindModule(); - vector node_types = { ServerType::ST_DB_PROXY }; + vector node_types = {ServerType::ST_DB_PROXY}; m_node_->AddSubscribeNode(node_types); return true; } -} \ No newline at end of file +} // namespace world::logic \ No newline at end of file diff --git a/src/node/world/logic/logic_module.h b/src/node/world/logic/logic_module.h index 6f47e96f..0da64724 100644 --- a/src/node/world/logic/logic_module.h +++ b/src/node/world/logic/logic_module.h @@ -11,6 +11,7 @@ class LogicModule : public ILogicModule { is_update_ = true; // Update } virtual bool Start() override; + private: INodeModule *m_node_; }; diff --git a/src/node/world/logic/plugin.cc b/src/node/world/logic/plugin.cc index 46fdb292..fb3d5f40 100644 --- a/src/node/world/logic/plugin.cc +++ b/src/node/world/logic/plugin.cc @@ -11,12 +11,8 @@ const int Plugin::GetPluginVersion() { return 0; } const std::string Plugin::GetPluginName() { return GET_CLASS_NAME(Plugin); } -void Plugin::Install() { - REGISTER_MODULE(pm_, ILogicModule, LogicModule) -} +void Plugin::Install() { REGISTER_MODULE(pm_, ILogicModule, LogicModule) } -void Plugin::Uninstall() { - UNREGISTER_MODULE(pm_, ILogicModule, LogicModule) -} +void Plugin::Uninstall() { UNREGISTER_MODULE(pm_, ILogicModule, LogicModule) } } // namespace world::logic \ No newline at end of file diff --git a/src/squick/plugin/node/i_node_module.h b/src/squick/plugin/node/i_node_module.h index 9dcc1337..ee5a97c6 100644 --- a/src/squick/plugin/node/i_node_module.h +++ b/src/squick/plugin/node/i_node_module.h @@ -10,5 +10,5 @@ class INodeModule : public IModule { public: virtual ServerInfo &GetNodeInfo() = 0; - virtual bool AddSubscribeNode(const vector& types) = 0; + virtual bool AddSubscribeNode(const vector &types) = 0; }; \ No newline at end of file