X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/f7163d9c994af13f0f72f49f7203b7ac3e281a1e..6664a19ff9913571d49a9252e58fddaa9cda7f30:/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp index 600f7d80..19d68f98 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp @@ -1,7 +1,6 @@ -#include #include -#include +#include #include #include "stg/tariffs.h" @@ -17,16 +16,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 +41,6 @@ port = p; return 0; } //----------------------------------------------------------------------------- -uint16_t STG_CONFIG_SETTINGS::GetPort() const -{ -return port; -} -//----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- PLUGIN * GetPlugin() @@ -82,36 +66,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 +74,6 @@ if (ret) return ret; } //----------------------------------------------------------------------------- -const std::string & STG_CONFIG::GetStrError() const -{ -return errorStr; -} -//----------------------------------------------------------------------------- int STG_CONFIG::Start() { if (isRunning) @@ -188,31 +137,14 @@ if (isRunning) return 0; } //----------------------------------------------------------------------------- -bool STG_CONFIG::IsRunning() -{ -return isRunning; -} -//----------------------------------------------------------------------------- void * STG_CONFIG::Run(void * d) { STG_CONFIG * stgConf = (STG_CONFIG *)d; stgConf->isRunning = true; -stgConf->config.Run(&stgConf->config); +stgConf->config.Run(); stgConf->isRunning = false; return NULL; } //----------------------------------------------------------------------------- -uint16_t STG_CONFIG::GetStartPosition() const -{ -return 220; -} -//----------------------------------------------------------------------------- -uint16_t STG_CONFIG::GetStopPosition() const -{ -return 220; -} -//----------------------------------------------------------------------------- - -