Виправлено роботу з перекодуванням рядків

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / rpcconfig.h

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
index 6fc41e202df499aff395a372990aa809d456448d..15ff1291f3fef0dc2cf57b327ad8028a919ee677 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
@@ -1,31 +1,29 @@
 #ifndef __RPC_CONFIG_H__
 #define __RPC_CONFIG_H__
 
-#include <string>
+#include <pthread.h>
+
 #include <ctime>
+#include <string>
+#include <map>
 
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 #include <xmlrpc-c/server_abyss.hpp>
 
-#include <pthread.h>
-
 #include "os_int.h"
 #include "base_plugin.h"
-#include "base_store.h"
-#include "base_settings.h"
 #include "admin_conf.h"
-#include "../../../admin.h"
-#include "../../../admins.h"
-#include "../../../users.h"
-#include "../../../tariffs.h"
-#include "../../../traffcounter.h"
-#include "../../../settings.h"
 
 #define RPC_CONFIG_VERSION "Stargazer RPC v. 0.2"
 
 extern "C" BASE_PLUGIN * GetPlugin();
 
+class ADMINS;
+class TARIFFS;
+class USERS;
+class BASE_STORE;
+
 class RPC_CONFIG_SETTINGS
 {
 public:
@@ -58,24 +56,24 @@ public:
     RPC_CONFIG();
     virtual ~RPC_CONFIG();
 
-    void                SetUsers(USERS * u) { users = u; };
-    void                SetTariffs(TARIFFS * t) { tariffs = t; };
-    void                SetAdmins(ADMINS * a) { admins = a; };
-    void                SetStore(BASE_STORE * s) { store = s; };
-    void                SetTraffcounter(TRAFFCOUNTER *) {};
-    void                SetStgSettings(const SETTINGS * s) { stgSettings = s; };
-    void                SetSettings(const MODULE_SETTINGS & s) { settings = s; };
+    void                SetUsers(USERS * u) { users = u; }
+    void                SetTariffs(TARIFFS * t) { tariffs = t; }
+    void                SetAdmins(ADMINS * a) { admins = a; }
+    void                SetStore(BASE_STORE * s) { store = s; }
+    void                SetTraffcounter(TRAFFCOUNTER *) {}
+    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() { return running && !stopped; };
+    int                 Reload() { return 0; }
+    bool                IsRunning() { return running && !stopped; }
 
-    const string      & GetStrError() const { return errorStr; };
-    const string        GetVersion() const { return RPC_CONFIG_VERSION; };
-    uint16_t            GetStartPosition() const { return 220; };
-    uint16_t            GetStopPosition() const { return 220; };
+    const string      & GetStrError() const { return errorStr; }
+    const string        GetVersion() const { return RPC_CONFIG_VERSION; }
+    uint16_t            GetStartPosition() const { return 220; }
+    uint16_t            GetStopPosition() const { return 220; }
 
     bool                GetAdminInfo(const std::string & cookie,
                                      ADMIN_INFO * info);
@@ -85,6 +83,10 @@ public:
     bool                LogoutAdmin(const std::string & cookie);
 
 private:
+    static void *           Run(void *);
+    std::string             GetCookie() const;
+    void                    InitiateRegistry();
+
     mutable string          errorStr;
     RPC_CONFIG_SETTINGS     rpcConfigSettings;
     USERS *                 users;
@@ -100,10 +102,6 @@ private:
     pthread_t               tid;
     std::map<std::string,
              ADMIN_INFO>    cookies;
-
-    static void *           Run(void *);
-    std::string             GetCookie() const;
-    void                    InitiateRegistry();
 };
 
 #endif