X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c963a109219ed101fa42f501b16f90d7b7b4f3f2..143aec2c09f1eafee27b02ad3f138149eb1c20e2:/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 baf7cbee..600f7d80 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp @@ -4,35 +4,16 @@ #include +#include "stg/tariffs.h" +#include "stg/admins.h" +#include "stg/users.h" +#include "stg/plugin_creator.h" #include "stgconfig.h" -#include "tariffs.h" -#include "admins.h" -#include "users.h" -class STGCONFIG_CREATOR -{ -private: - STG_CONFIG * stgconfig; - -public: - STGCONFIG_CREATOR() - : stgconfig(new STG_CONFIG()) - { - }; - ~STGCONFIG_CREATOR() - { - delete stgconfig; - }; - - STG_CONFIG * GetPlugin() - { - return stgconfig; - }; -}; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -STGCONFIG_CREATOR stgc; +PLUGIN_CREATOR stgc; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -46,21 +27,6 @@ const std::string & STG_CONFIG_SETTINGS::GetStrError() const return errorStr; } //----------------------------------------------------------------------------- -int STG_CONFIG_SETTINGS::ParseIntInRange(const std::string & str, int min, int max, int * val) -{ -if (str2x(str.c_str(), *val)) - { - errorStr = "Incorrect value \'" + str + "\'."; - return -1; - } -if (*val < min || *val > max) - { - errorStr = "Value \'" + str + "\' out of range."; - return -1; - } -return 0; -} -//----------------------------------------------------------------------------- int STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s) { int p;