From a5b2a0646b1822cd2786bf983bfeb8321e9dfa3c Mon Sep 17 00:00:00 2001 From: helen Date: Tue, 2 Aug 2011 14:46:47 +0300 Subject: [PATCH] Make some methods inline --- .../configuration/sgconfig/stgconfig.cpp | 67 ------------------- .../configuration/sgconfig/stgconfig.h | 26 +++---- 2 files changed, 13 insertions(+), 80 deletions(-) diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp index 600f7d80..1f2a3c7c 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp @@ -17,16 +17,6 @@ PLUGIN_CREATOR stgc; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -STG_CONFIG_SETTINGS::STG_CONFIG_SETTINGS() - : port(0) -{ -} -//----------------------------------------------------------------------------- -const std::string & STG_CONFIG_SETTINGS::GetStrError() const -{ -return errorStr; -} -//----------------------------------------------------------------------------- int STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s) { int p; @@ -52,11 +42,6 @@ port = p; return 0; } //----------------------------------------------------------------------------- -uint16_t STG_CONFIG_SETTINGS::GetPort() const -{ -return port; -} -//----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- PLUGIN * GetPlugin() @@ -82,36 +67,6 @@ STG_CONFIG::STG_CONFIG() { } //----------------------------------------------------------------------------- -void STG_CONFIG::SetUsers(USERS * u) -{ -users = u; -} -//----------------------------------------------------------------------------- -void STG_CONFIG::SetTariffs(TARIFFS * t) -{ -tariffs = t; -} -//----------------------------------------------------------------------------- -void STG_CONFIG::SetAdmins(ADMINS * a) -{ -admins = a; -} -//----------------------------------------------------------------------------- -void STG_CONFIG::SetStore(STORE * s) -{ -store = s; -} -//----------------------------------------------------------------------------- -void STG_CONFIG::SetStgSettings(const SETTINGS * s) -{ -stgSettings = s; -} -//----------------------------------------------------------------------------- -void STG_CONFIG::SetSettings(const MODULE_SETTINGS & s) -{ -settings = s; -} -//----------------------------------------------------------------------------- int STG_CONFIG::ParseSettings() { int ret = stgConfigSettings.ParseSettings(settings); @@ -120,11 +75,6 @@ if (ret) return ret; } //----------------------------------------------------------------------------- -const std::string & STG_CONFIG::GetStrError() const -{ -return errorStr; -} -//----------------------------------------------------------------------------- int STG_CONFIG::Start() { if (isRunning) @@ -188,11 +138,6 @@ if (isRunning) return 0; } //----------------------------------------------------------------------------- -bool STG_CONFIG::IsRunning() -{ -return isRunning; -} -//----------------------------------------------------------------------------- void * STG_CONFIG::Run(void * d) { STG_CONFIG * stgConf = (STG_CONFIG *)d; @@ -204,15 +149,3 @@ stgConf->isRunning = false; return NULL; } //----------------------------------------------------------------------------- -uint16_t STG_CONFIG::GetStartPosition() const -{ -return 220; -} -//----------------------------------------------------------------------------- -uint16_t STG_CONFIG::GetStopPosition() const -{ -return 220; -} -//----------------------------------------------------------------------------- - - diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h index efa57d45..ce1c3af8 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h @@ -15,11 +15,11 @@ class STG_CONFIG; class STG_CONFIG_SETTINGS { public: - STG_CONFIG_SETTINGS(); + STG_CONFIG_SETTINGS() : port(0) {} virtual ~STG_CONFIG_SETTINGS() {} - const std::string & GetStrError() const; + const std::string & GetStrError() const { return errorStr; } int ParseSettings(const MODULE_SETTINGS & s); - uint16_t GetPort() const; + uint16_t GetPort() const { return port; } private: std::string errorStr; int port; @@ -30,24 +30,24 @@ public: STG_CONFIG(); virtual ~STG_CONFIG(){}; - void SetUsers(USERS * u); - void SetTariffs(TARIFFS * t); - void SetAdmins(ADMINS * a); - void SetStore(STORE * s); + void SetUsers(USERS * u) { users = u; } + void SetTariffs(TARIFFS * t) { tariffs = t; } + void SetAdmins(ADMINS * a) { admins = a; } + void SetStore(STORE * s) { store = s; } void SetTraffcounter(TRAFFCOUNTER *) {} - void SetStgSettings(const SETTINGS * s); - void SetSettings(const MODULE_SETTINGS & s); + void SetStgSettings(const SETTINGS * s) { stgSettings = s; } + void SetSettings(const MODULE_SETTINGS & s) { settings = s; } int ParseSettings(); int Start(); int Stop(); int Reload() { return 0; } - bool IsRunning(); + bool IsRunning() { return isRunning; } - const std::string & GetStrError() const; + const std::string & GetStrError() const { return errorStr; } const std::string GetVersion() const; - uint16_t GetStartPosition() const; - uint16_t GetStopPosition() const; + uint16_t GetStartPosition() const { return 220; } + uint16_t GetStopPosition() const { return 220; } private: static void * Run(void *); -- 2.44.2