Merge branch 'master' into full-month-stats

[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 83ffa59b91991489ca52edf91e36ae8d5232108f..9db9fd933f62ddb22de521a3c88d771c81777ba8 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
@@ -5,8 +5,8 @@
 
 #include <string>
 
 
 #include <string>
 

-#include "plugin.h"
-#include "store.h"
+#include "stg/plugin.h"
+#include "stg/store.h"

 #include "configproto.h"
 
 extern "C" PLUGIN * GetPlugin();
 #include "configproto.h"
 
 extern "C" PLUGIN * GetPlugin();


@@ -15,13 +15,12 @@ class STG_CONFIG;
 
 class STG_CONFIG_SETTINGS {
 public:
 
 class STG_CONFIG_SETTINGS {
 public:

-                    STG_CONFIG_SETTINGS();
+                    STG_CONFIG_SETTINGS() : errorStr(), port(0) {}

     virtual         ~STG_CONFIG_SETTINGS() {}
     virtual         ~STG_CONFIG_SETTINGS() {}

-    const std::string & GetStrError() const;
+    const std::string & GetStrError() const { return errorStr; }

     int             ParseSettings(const MODULE_SETTINGS & s);
     int             ParseSettings(const MODULE_SETTINGS & s);

-    uint16_t        GetPort() const;
+    uint16_t        GetPort() const { return port; }

 private:
 private:

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

     std::string errorStr;
     int     port;
 };
     std::string errorStr;
     int     port;
 };


@@ -31,27 +30,30 @@ public:
     STG_CONFIG();
     virtual ~STG_CONFIG(){};
 
     STG_CONFIG();
     virtual ~STG_CONFIG(){};
 

-    void                SetUsers(USERS * u);
-    void                SetTariffs(TARIFFS * t);
-    void                SetAdmins(ADMINS * a);
-    void                SetStore(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; }
     int                 ParseSettings();
 
     int                 Start();
     int                 Stop();
     int                 Reload() { return 0; }

-    bool                IsRunning();
+    bool                IsRunning() { return isRunning; }

 
 

-    const std::string & GetStrError() const;
+    const std::string & GetStrError() const { return errorStr; }

     const std::string   GetVersion() const;
     const std::string   GetVersion() const;

-    uint16_t            GetStartPosition() const;
-    uint16_t            GetStopPosition() const;
+    uint16_t            GetStartPosition() const { return 220; }
+    uint16_t            GetStopPosition() const { return 220; }

 
 private:
 
 private:

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

     static void *       Run(void *);
     static void *       Run(void *);

+

     mutable std::string errorStr;
     STG_CONFIG_SETTINGS stgConfigSettings;
     pthread_t           thread;
     mutable std::string errorStr;
     STG_CONFIG_SETTINGS stgConfigSettings;
     pthread_t           thread;