From: Maxim Mamontov Date: Fri, 23 Aug 2013 16:13:05 +0000 (+0300) Subject: Removed some unused stuff. X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/202f3981d5c015654fc43dc2d38529023b2bf74a Removed some unused stuff. --- diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h index 636fa542..e76d8f4c 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.h +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.h @@ -39,18 +39,18 @@ public: virtual ~BASE_PARSER() {} virtual int ParseStart(void *data, const char *el, const char **attr) = 0; virtual int ParseEnd(void *data, const char *el) = 0; - virtual void CreateAnswer() = 0; - virtual void SetAnswerList(std::list * ansList) { answerList = ansList; } - virtual void SetUsers(USERS * u) { users = u; } - virtual void SetAdmins(ADMINS * a) { admins = a; } - virtual void SetTariffs(TARIFFS * t) { tariffs = t; } - virtual void SetStore(STORE * s) { store = s; } - virtual void SetStgSettings(const SETTINGS * s) { settings = s; } + void SetAnswerList(std::list * ansList) { answerList = ansList; } - virtual void SetCurrAdmin(ADMIN & cua) { currAdmin = &cua; } - virtual std::string & GetStrError() { return strError; } - virtual void Reset() { answerList->clear(); depth = 0; } + void SetUsers(USERS * u) { users = u; } + void SetAdmins(ADMINS * a) { admins = a; } + void SetTariffs(TARIFFS * t) { tariffs = t; } + void SetStore(STORE * s) { store = s; } + void SetStgSettings(const SETTINGS * s) { settings = s; } + + void SetCurrAdmin(ADMIN & cua) { currAdmin = &cua; } + std::string & GetStrError() { return strError; } + void Reset() { answerList->clear(); depth = 0; } protected: BASE_PARSER(const BASE_PARSER & rvalue); @@ -71,6 +71,8 @@ class PARSER_GET_ADMINS: public BASE_PARSER { public: int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); + +private: void CreateAnswer(); }; //----------------------------------------------------------------------------- @@ -79,9 +81,11 @@ public: PARSER_ADD_ADMIN() : BASE_PARSER(), adminToAdd() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); - void CreateAnswer(); + private: std::string adminToAdd; + + void CreateAnswer(); }; //----------------------------------------------------------------------------- class PARSER_DEL_ADMIN: public BASE_PARSER { @@ -89,10 +93,12 @@ public: PARSER_DEL_ADMIN() : BASE_PARSER(), adminToDel() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); - void CreateAnswer(); + private: - int CheckAttr(const char **attr); std::string adminToDel; + + int CheckAttr(const char **attr); + void CreateAnswer(); }; //----------------------------------------------------------------------------- class PARSER_CHG_ADMIN: public BASE_PARSER { @@ -100,17 +106,21 @@ public: PARSER_CHG_ADMIN() : BASE_PARSER(), login(), password(), privAsString() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); - void CreateAnswer(); + private: RESETABLE login; RESETABLE password; RESETABLE privAsString; + + void CreateAnswer(); }; //----------------------------------------------------------------------------- class PARSER_GET_SERVER_INFO: public BASE_PARSER { public: int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); + +private: void CreateAnswer(); }; //----------------------------------------------------------------------------- @@ -120,9 +130,11 @@ public: ~PARSER_GET_USER() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); - void CreateAnswer(); + private: std::string login; + + void CreateAnswer(); }; //----------------------------------------------------------------------------- class PARSER_GET_USERS: public BASE_PARSER { @@ -130,16 +142,20 @@ public: PARSER_GET_USERS() : BASE_PARSER(), lastUserUpdateTime(0), lastUpdateFound(false) {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); - void CreateAnswer(); + private: time_t lastUserUpdateTime; bool lastUpdateFound; + + void CreateAnswer(); }; //----------------------------------------------------------------------------- class PARSER_GET_TARIFFS: public BASE_PARSER { public: int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); + +private: void CreateAnswer(); }; //----------------------------------------------------------------------------- @@ -148,9 +164,11 @@ public: PARSER_ADD_TARIFF() : BASE_PARSER(), tariffToAdd() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); - void CreateAnswer(); + private: std::string tariffToAdd; + + void CreateAnswer(); }; //----------------------------------------------------------------------------- class PARSER_DEL_TARIFF: public BASE_PARSER { @@ -158,9 +176,11 @@ public: PARSER_DEL_TARIFF() : BASE_PARSER(), tariffToDel() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); - void CreateAnswer(); + private: std::string tariffToDel; + + void CreateAnswer(); }; //----------------------------------------------------------------------------- class PARSER_CHG_TARIFF: public BASE_PARSER { @@ -168,14 +188,15 @@ public: PARSER_CHG_TARIFF() : BASE_PARSER(), td() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); - void CreateAnswer(); + private: + TARIFF_DATA_RES td; + int ParseSlashedIntParams(int paramsNum, const std::string & s, int * params); int ParseSlashedDoubleParams(int paramsNum, const std::string & s, double * params); int CheckTariffData(); int AplayChanges(); - - TARIFF_DATA_RES td; + void CreateAnswer(); }; //-----------------------------------------------------------------------------/ class PARSER_ADD_USER: public BASE_PARSER { @@ -184,11 +205,13 @@ public: ~PARSER_ADD_USER() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); - void CreateAnswer(); - void Reset(); + private: - int CheckUserData(); std::string login; + + int CheckUserData(); + void CreateAnswer(); + void Reset(); }; //----------------------------------------------------------------------------- class PARSER_CHG_USER: public BASE_PARSER { @@ -197,15 +220,8 @@ public: ~PARSER_CHG_USER(); int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); - void CreateAnswer(); - void Reset(); -private: - PARSER_CHG_USER(const PARSER_CHG_USER & rvalue); - PARSER_CHG_USER & operator=(const PARSER_CHG_USER & rvalue); - - std::string EncChar2String(const char *); - int AplayChanges(); +private: USER_STAT_RES * usr; USER_CONF_RES * ucr; RESETABLE * upr; @@ -214,6 +230,14 @@ private: std::string login; bool cashMustBeAdded; int res; + + PARSER_CHG_USER(const PARSER_CHG_USER & rvalue); + PARSER_CHG_USER & operator=(const PARSER_CHG_USER & rvalue); + + std::string EncChar2String(const char *); + int AplayChanges(); + void CreateAnswer(); + void Reset(); }; //----------------------------------------------------------------------------- class PARSER_DEL_USER: public BASE_PARSER { @@ -221,21 +245,24 @@ public: PARSER_DEL_USER() : BASE_PARSER(), res(0), u(NULL) {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); - void CreateAnswer(); private: + int res; + USER * u; + PARSER_DEL_USER(const PARSER_DEL_USER & rvalue); PARSER_DEL_USER & operator=(const PARSER_DEL_USER & rvalue); - int res; - USER * u; + void CreateAnswer(); }; //----------------------------------------------------------------------------- class PARSER_CHECK_USER: public BASE_PARSER { public: - PARSER_CHECK_USER() : BASE_PARSER(), result(false) {} + PARSER_CHECK_USER() : BASE_PARSER() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); + +private: void CreateAnswer(const char * error); }; //----------------------------------------------------------------------------- @@ -244,18 +271,19 @@ public: PARSER_SEND_MESSAGE() : BASE_PARSER(), logins(), result(0), msg(), u(NULL) {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); - void CreateAnswer(); -private: - PARSER_SEND_MESSAGE(const PARSER_SEND_MESSAGE & rvalue); - PARSER_SEND_MESSAGE & operator=(const PARSER_SEND_MESSAGE & rvalue); - - int ParseLogins(const char * logins); +private: enum {res_ok, res_params_error, res_unknown}; std::vector logins; int result; STG_MSG msg; USER * u; + + PARSER_SEND_MESSAGE(const PARSER_SEND_MESSAGE & rvalue); + PARSER_SEND_MESSAGE & operator=(const PARSER_SEND_MESSAGE & rvalue); + + int ParseLogins(const char * logins); + void CreateAnswer(); }; //----------------------------------------------------------------------------- #endif //PARSER_H