Revert "Merge remote-tracking branch 'origin/master' into ticket37"

[stg.git] / projects / stargazer / plugins / authorization / stress / stress.h

diff --git a/projects/stargazer/plugins/authorization/stress/stress.h b/projects/stargazer/plugins/authorization/stress/stress.h
index 85eb75be83094e5a22fd2722a7b9fe5ca8747712..6ead8f3359f9254c31dc1632f02b71ddaeee967b 100644 (file)
--- a/projects/stargazer/plugins/authorization/stress/stress.h
+++ b/projects/stargazer/plugins/authorization/stress/stress.h
@@ -46,6 +46,7 @@ class AUTH_STRESS;
 template <typename varParamType>
 class CHG_BEFORE_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType> {
 public:
 template <typename varParamType>
 class CHG_BEFORE_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType> {
 public:

+    CHG_BEFORE_NOTIFIER() : auth(NULL) {}

     void Notify(const varParamType & oldValue, const varParamType & newValue);
     void        SetUser(USER_PTR u) { user = u; }
     USER_PTR    GetUser() {return user; }
     void Notify(const varParamType & oldValue, const varParamType & newValue);
     void        SetUser(USER_PTR u) { user = u; }
     USER_PTR    GetUser() {return user; }


@@ -59,6 +60,7 @@ private:
 template <typename varParamType>
 class CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType> {
 public:
 template <typename varParamType>
 class CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType> {
 public:

+    CHG_AFTER_NOTIFIER() : auth(NULL) {}

     void        Notify(const varParamType & oldValue, const varParamType & newValue);
     void        SetUser(USER_PTR u) { user = u; }
     USER_PTR    GetUser() {return user; }
     void        Notify(const varParamType & oldValue, const varParamType & newValue);
     void        SetUser(USER_PTR u) { user = u; }
     USER_PTR    GetUser() {return user; }


@@ -76,7 +78,6 @@ public:
     int             ParseSettings(const MODULE_SETTINGS & s);
     int             GetAverageOnlineTime() const;
 private:
     int             ParseSettings(const MODULE_SETTINGS & s);
     int             GetAverageOnlineTime() const;
 private:

-    int             ParseIntInRange(const std::string & str, int min, int max, int * val);

     int             averageOnlineTime;
     std::string     errorStr;
 };
     int             averageOnlineTime;
     std::string     errorStr;
 };


@@ -89,15 +90,10 @@ public:
     virtual ~AUTH_STRESS() {}
 
     void                SetUsers(USERS * u);
     virtual ~AUTH_STRESS() {}
 
     void                SetUsers(USERS * u);

-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}

 
     int                 Start();
     int                 Stop();
 
     int                 Start();
     int                 Stop();

-    int                 Reload() { return 0; }
+    int                 Reload(const MODULE_SETTINGS & /*ms*/) { return 0; }

     bool                IsRunning();
     void                SetSettings(const MODULE_SETTINGS & s);
     int                 ParseSettings();
     bool                IsRunning();
     void                SetSettings(const MODULE_SETTINGS & s);
     int                 ParseSettings();


@@ -138,7 +134,7 @@ private:
 
     class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
     public:
 
     class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
     public:

-        ADD_USER_NONIFIER() {}
+        ADD_USER_NONIFIER() : auth(NULL) {}

         virtual ~ADD_USER_NONIFIER() {}
 
         void SetAuthorizator(AUTH_STRESS * a) { auth = a; }
         virtual ~ADD_USER_NONIFIER() {}
 
         void SetAuthorizator(AUTH_STRESS * a) { auth = a; }


@@ -153,7 +149,7 @@ private:
 
     class DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
     public:
 
     class DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
     public:

-        DEL_USER_NONIFIER() {}
+        DEL_USER_NONIFIER() : auth(NULL) {}

         virtual ~DEL_USER_NONIFIER() {}
 
         void SetAuthorizator(AUTH_STRESS * a) { auth = a; }
         virtual ~DEL_USER_NONIFIER() {}
 
         void SetAuthorizator(AUTH_STRESS * a) { auth = a; }