Removed unused variables.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / parser.h

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h
index b48d31ccc2e286e574502c89689a7149cf0c329b..df3d7155872b56f3a08aaad57e6d750ce6b0853c 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.h
@@ -9,125 +9,125 @@
 
 #include <list>
 #include <string>
 
 #include <list>
 #include <string>

+#include <vector>

 
 

-#include "resetable.h"
-#include "stg_const.h"
-#include "base_store.h"
-#include "../../../admins.h"
-#include "../../../users.h"
-#include "stg_message.h"
+#include "stg/resetable.h"
+#include "stg/const.h"
+#include "stg/store.h"
+#include "stg/admins.h"
+#include "stg/admin.h"
+#include "stg/users.h"
+#include "stg/message.h"

 
 

-using namespace std;
+class TARIFFS;
+class SETTINGS;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-class BASE_PARSER
-{
+class BASE_PARSER {

 public:
     BASE_PARSER()
 public:
     BASE_PARSER()

-        : admins(NULL),
+        : strError(),
+          admins(NULL),

           users(NULL),
           tariffs(NULL),
           store(NULL),
           settings(NULL),
           users(NULL),
           tariffs(NULL),
           store(NULL),
           settings(NULL),

-          currAdmin(),
-          depth(0)
-    { };
-    virtual ~BASE_PARSER() {};
+          currAdmin(NULL),
+          depth(0),
+          answerList(NULL)
+    {}
+    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 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(list<string> * ansList) { answerList = ansList; };
+    virtual void SetAnswerList(std::list<std::string> * 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(BASE_STORE * s) { store = s; };
-    virtual void SetStgSettings(const SETTINGS * s) { settings = s; };
+    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; }
+
+    virtual void SetCurrAdmin(ADMIN & cua) { currAdmin = &cua; }
+    virtual std::string & GetStrError() { return strError; }
+    virtual void Reset() { answerList->clear(); depth = 0; }

 
 

-    virtual void SetCurrAdmin(const ADMIN & cua) { currAdmin = cua; };
-    virtual string & GetStrError(){return strError;};
-    virtual void Reset(){ answerList->clear(); depth = 0; };

 protected:
 protected:

-    string           strError;
+    BASE_PARSER(const BASE_PARSER & rvalue);
+    BASE_PARSER & operator=(const BASE_PARSER & rvalue);
+
+    std::string      strError;

     ADMINS *         admins;
     USERS *          users;
     TARIFFS *        tariffs;
     ADMINS *         admins;
     USERS *          users;
     TARIFFS *        tariffs;

-    BASE_STORE *     store;
+    STORE *          store;

     const SETTINGS * settings;
     const SETTINGS * settings;

-    ADMIN            currAdmin;
+    ADMIN          * currAdmin;

     int              depth;
     int              depth;

-    list<string> *   answerList;
+    std::list<std::string> * answerList;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class PARSER_GET_ADMINS: public BASE_PARSER
-{
+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);
     void CreateAnswer();
 };
 //-----------------------------------------------------------------------------
 public:
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 };
 //-----------------------------------------------------------------------------

-class PARSER_ADD_ADMIN: public BASE_PARSER
-{
+class PARSER_ADD_ADMIN: public BASE_PARSER {

 public:
 public:

-        PARSER_ADD_ADMIN() : BASE_PARSER() {}
+        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:
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 private:

-    string adminToAdd;
+    std::string adminToAdd;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class PARSER_DEL_ADMIN: public BASE_PARSER
-{
+class PARSER_DEL_ADMIN: public BASE_PARSER {

 public:
 public:

-        PARSER_DEL_ADMIN() : BASE_PARSER() {}
+        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);
     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);

-    string adminToDel;
+    std::string adminToDel;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class PARSER_CHG_ADMIN: public BASE_PARSER
-{
+class PARSER_CHG_ADMIN: public BASE_PARSER {

 public:
 public:

-        PARSER_CHG_ADMIN() : BASE_PARSER() {}
+        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:
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 private:

-    RESETABLE<string> login;
-    RESETABLE<string> password;
-    RESETABLE<string> privAsString;
+    RESETABLE<std::string> login;
+    RESETABLE<std::string> password;
+    RESETABLE<std::string> privAsString;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class PARSER_GET_SERVER_INFO: public BASE_PARSER
-{
+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);
     void CreateAnswer();
 };
 public:
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 };

-

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-class PARSER_GET_USER: public BASE_PARSER
-{
+class PARSER_GET_USER: public BASE_PARSER {

 public:
 public:

-        PARSER_GET_USER();
-        ~PARSER_GET_USER(){};
+        PARSER_GET_USER() : BASE_PARSER(), login() {}
+        ~PARSER_GET_USER() {}

     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 private:
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 private:

-    string  login;
+    std::string login;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class PARSER_GET_USERS: public BASE_PARSER
-{
+class PARSER_GET_USERS: public BASE_PARSER {

 public:
 public:

-        PARSER_GET_USERS();
+        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();
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();


@@ -136,68 +136,62 @@ private:
     bool lastUpdateFound;
 };
 //-----------------------------------------------------------------------------
     bool lastUpdateFound;
 };
 //-----------------------------------------------------------------------------

-class PARSER_GET_TARIFFS: public BASE_PARSER
-{
+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);
     void CreateAnswer();
 };
 //-----------------------------------------------------------------------------
 public:
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 };
 //-----------------------------------------------------------------------------

-class PARSER_ADD_TARIFF: public BASE_PARSER
-{
+class PARSER_ADD_TARIFF: public BASE_PARSER {

 public:
 public:

-        PARSER_ADD_TARIFF() : BASE_PARSER() {}
+        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:
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 private:

-    string tariffToAdd;
+    std::string tariffToAdd;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class PARSER_DEL_TARIFF: public BASE_PARSER
-{
+class PARSER_DEL_TARIFF: public BASE_PARSER {

 public:
 public:

-        PARSER_DEL_TARIFF() : BASE_PARSER() {}
+        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:
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 private:

-    string tariffToDel;
+    std::string tariffToDel;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class PARSER_CHG_TARIFF: public BASE_PARSER
-{
+class PARSER_CHG_TARIFF: public BASE_PARSER {

 public:
 public:

-        PARSER_CHG_TARIFF() : BASE_PARSER() {}
+        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:
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 private:

-    int ParseSlashedIntParams(int paramsNum, const string & s, int * params);
-    int ParseSlashedDoubleParams(int paramsNum, const string & s, double * params);
+    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;
 };
 //-----------------------------------------------------------------------------/
     int CheckTariffData();
     int AplayChanges();
 
     TARIFF_DATA_RES td;
 };
 //-----------------------------------------------------------------------------/

-class PARSER_ADD_USER: public BASE_PARSER
-{
+class PARSER_ADD_USER: public BASE_PARSER {

 public:
 public:

-        PARSER_ADD_USER();
-        ~PARSER_ADD_USER(){};
+        PARSER_ADD_USER() : BASE_PARSER(), login() {}
+        ~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();
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
     void Reset();
 private:
     int CheckUserData();

-    string login;
+    std::string login;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class PARSER_CHG_USER: public BASE_PARSER
-{
+class PARSER_CHG_USER: public BASE_PARSER {

 public:
         PARSER_CHG_USER();
         ~PARSER_CHG_USER();
 public:
         PARSER_CHG_USER();
         ~PARSER_CHG_USER();


@@ -206,34 +200,38 @@ public:
     void CreateAnswer();
     void Reset();
 private:
     void CreateAnswer();
     void Reset();
 private:

-    string EncChar2String(const char *);
+    PARSER_CHG_USER(const PARSER_CHG_USER & rvalue);
+    PARSER_CHG_USER & operator=(const PARSER_CHG_USER & rvalue);
+
+    std::string EncChar2String(const char *);

     int AplayChanges();
 
     USER_STAT_RES * usr;
     USER_CONF_RES * ucr;
     RESETABLE<uint64_t> * upr;
     RESETABLE<uint64_t> * downr;
     int AplayChanges();
 
     USER_STAT_RES * usr;
     USER_CONF_RES * ucr;
     RESETABLE<uint64_t> * upr;
     RESETABLE<uint64_t> * downr;

-    string cashMsg;
-    string login;
+    std::string cashMsg;
+    std::string login;

     bool cashMustBeAdded;
     int res;
 };
 //-----------------------------------------------------------------------------
     bool cashMustBeAdded;
     int res;
 };
 //-----------------------------------------------------------------------------

-class PARSER_DEL_USER: public BASE_PARSER
-{
+class PARSER_DEL_USER: public BASE_PARSER {

 public:
 public:

-        PARSER_DEL_USER() : BASE_PARSER(), res(0) {}
+        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 ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 
 private:

+    PARSER_DEL_USER(const PARSER_DEL_USER & rvalue);
+    PARSER_DEL_USER & operator=(const PARSER_DEL_USER & rvalue);
+

     int res;
     int res;

-    user_iter u;
+    USER * u;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class PARSER_CHECK_USER: public BASE_PARSER
-{
+class PARSER_CHECK_USER: public BASE_PARSER {

 public:
         PARSER_CHECK_USER() : BASE_PARSER(), result(false) {}
     int ParseStart(void *data, const char *el, const char **attr);
 public:
         PARSER_CHECK_USER() : BASE_PARSER(), result(false) {}
     int ParseStart(void *data, const char *el, const char **attr);


@@ -243,21 +241,23 @@ private:
     bool result;
 };
 //-----------------------------------------------------------------------------
     bool result;
 };
 //-----------------------------------------------------------------------------

-class PARSER_SEND_MESSAGE: public BASE_PARSER
-{
+class PARSER_SEND_MESSAGE: public BASE_PARSER {

 public:
 public:

-        PARSER_SEND_MESSAGE() : BASE_PARSER(), result(0) {}
+        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:
     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);
 
     enum {res_ok, res_params_error, res_unknown};
     int ParseLogins(const char * logins);
 
     enum {res_ok, res_params_error, res_unknown};

-    vector<string> logins;
+    std::vector<std::string> logins;

     int result;
     STG_MSG msg;
     int result;
     STG_MSG msg;

-    user_iter u;
+    USER * u;

 };
 //-----------------------------------------------------------------------------
 #endif //PARSER_H
 };
 //-----------------------------------------------------------------------------
 #endif //PARSER_H