Re-organized includes.

[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 cdce9668bf6931c34ecbdf622b31cbf678e3ff28..8fa4dc7691abd3584242c306f403c451b9e3f131 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
@@ -7,6 +7,7 @@
 
 #include "stg/plugin.h"
 #include "stg/store.h"
 
 #include "stg/plugin.h"
 #include "stg/store.h"

+#include "stg/logger.h"

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


@@ -22,13 +23,13 @@ public:
     uint16_t        GetPort() const { return port; }
 private:
     std::string errorStr;
     uint16_t        GetPort() const { return port; }
 private:
     std::string errorStr;

-    int     port;
+    uint16_t    port;

 };
 //-----------------------------------------------------------------------------
 class STG_CONFIG :public PLUGIN {
 public:
     STG_CONFIG();
 };
 //-----------------------------------------------------------------------------
 class STG_CONFIG :public PLUGIN {
 public:
     STG_CONFIG();

-    virtual ~STG_CONFIG(){};
+    virtual ~STG_CONFIG(){}

 
     void                SetUsers(USERS * u) { users = u; }
     void                SetTariffs(TARIFFS * t) { tariffs = t; }
 
     void                SetUsers(USERS * u) { users = u; }
     void                SetTariffs(TARIFFS * t) { tariffs = t; }


@@ -44,7 +45,7 @@ public:
     bool                IsRunning() { return isRunning; }
 
     const std::string & GetStrError() const { return errorStr; }
     bool                IsRunning() { return isRunning; }
 
     const std::string & GetStrError() const { return errorStr; }

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

     uint16_t            GetStartPosition() const { return 20; }
     uint16_t            GetStopPosition() const { return 20; }
 
     uint16_t            GetStartPosition() const { return 20; }
     uint16_t            GetStopPosition() const { return 20; }
 


@@ -59,6 +60,7 @@ private:
     pthread_t           thread;
     bool                nonstop;
     bool                isRunning;
     pthread_t           thread;
     bool                nonstop;
     bool                isRunning;

+    PLUGIN_LOGGER       logger;

     CONFIGPROTO         config;
     USERS *             users;
     ADMINS *            admins;
     CONFIGPROTO         config;
     USERS *             users;
     ADMINS *            admins;