Help updated

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

diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
index 57241c637f26049264235eb7823dfd4fef88cbbf..9db9fd933f62ddb22de521a3c88d771c81777ba8 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
@@ -1,92 +1,60 @@
-#include <string>
-#include <pthread.h>
-#include "base_plugin.h"
-#include "base_store.h"
-#include "configproto.h"
-//#include "user_ips.h"
-//#include "../../../users.h"
+#ifndef STGCONFIG_H
+#define STGCONFIG_H
 
-using namespace std;
+#include <pthread.h>
 
-extern "C" BASE_PLUGIN * GetPlugin();
+#include <string>
 
-class STG_CONFIG;
+#include "stg/plugin.h"
+#include "stg/store.h"
+#include "configproto.h"
 
-//-----------------------------------------------------------------------------
-/*template <typename varParamType>
-class CHG_BEFORE_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
-{
-public:
-    void Notify(const varParamType & oldValue, const varParamType & newValue)
-        {
-        auth->Unauthorize(user);
-        }
-    void SetUser(USER * u) { user = u; }
-    void SetAuthorizaror(const AUTH_AO * a) { auth = a; }
+extern "C" PLUGIN * GetPlugin();
 
-private:
-    USER * user;
-    const AUTH_AO * auth;
-};
-//-----------------------------------------------------------------------------
-template <typename varParamType>
-class CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
-{
-public:
-    void Notify(const varParamType & oldValue, const varParamType & newValue)
-        {
-        auth->UpdateUserAuthorization(user);
-        }
-    void SetUser(USER * u) { user = u; }
-    void SetAuthorizaror(const AUTH_AO * a) { auth = a; }
+class STG_CONFIG;
 
-private:
-    USER * user;
-    const AUTH_AO * auth;
-};*/
-//-----------------------------------------------------------------------------
-class STG_CONFIG_SETTINGS
-{
+class STG_CONFIG_SETTINGS {
 public:
-                    STG_CONFIG_SETTINGS();
-    virtual         ~STG_CONFIG_SETTINGS(){};
-    const string &  GetStrError() const;
+                    STG_CONFIG_SETTINGS() : errorStr(), port(0) {}
+    virtual         ~STG_CONFIG_SETTINGS() {}
+    const std::string & GetStrError() const { return errorStr; }
     int             ParseSettings(const MODULE_SETTINGS & s);
-    uint16_t        GetPort();
+    uint16_t        GetPort() const { return port; }
 private:
-    int     ParseIntInRange(const string & str, int min, int max, int * val);
-    string  errorStr;
+    std::string errorStr;
     int     port;
 };
 //-----------------------------------------------------------------------------
-class STG_CONFIG :public BASE_PLUGIN
-{
+class STG_CONFIG :public PLUGIN {
 public:
     STG_CONFIG();
     virtual ~STG_CONFIG(){};
 
-    void                SetUsers(USERS * u);
-    void                SetTariffs(TARIFFS * t);
-    void                SetAdmins(ADMINS * a);
-    void                SetStore(BASE_STORE * s);
-    void                SetTraffcounter(TRAFFCOUNTER *){};
-    void                SetStgSettings(const SETTINGS * s);
-    void                SetSettings(const MODULE_SETTINGS & s);
+    void                SetUsers(USERS * u) { users = u; }
+    void                SetTariffs(TARIFFS * t) { tariffs = t; }
+    void                SetAdmins(ADMINS * a) { admins = a; }
+    void                SetStore(STORE * s) { store = s; }
+    void                SetStgSettings(const SETTINGS * s) { stgSettings = s; }
+    void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();
 
     int                 Start();
     int                 Stop();
-    int                 Reload() { return 0; };
-    bool                IsRunning();
+    int                 Reload() { return 0; }
+    bool                IsRunning() { return isRunning; }
 
-    const string      & GetStrError() const;
-    const string        GetVersion() const;
-    uint16_t            GetStartPosition() const;
-    uint16_t            GetStopPosition() const;
+    const std::string & GetStrError() const { return errorStr; }
+    const std::string   GetVersion() const;
+    uint16_t            GetStartPosition() const { return 220; }
+    uint16_t            GetStopPosition() const { return 220; }
 
 private:
+    STG_CONFIG(const STG_CONFIG & rvalue);
+    STG_CONFIG & operator=(const STG_CONFIG & rvalue);
+
     static void *       Run(void *);
-    mutable string      errorStr;
+
+    mutable std::string errorStr;
     STG_CONFIG_SETTINGS stgConfigSettings;
     pthread_t           thread;
     bool                nonstop;
@@ -95,10 +63,10 @@ private:
     USERS *             users;
     ADMINS *            admins;
     TARIFFS *           tariffs;
-    BASE_STORE *        store;
+    STORE *             store;
     MODULE_SETTINGS     settings;
     const SETTINGS *    stgSettings;
 };
 //-----------------------------------------------------------------------------
 
-
+#endif