Fix compilation issues

[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 21a8a3d49160221ce1d534d25a1448db8534169b..58e8973a44e4c9d2c7e7ce2a542dcdcbbeebf1b8 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
@@ -12,17 +12,17 @@
 #include <xmlrpc-c/server_abyss.hpp>
 
 #include "os_int.h"
 #include <xmlrpc-c/server_abyss.hpp>
 
 #include "os_int.h"

-#include "base_plugin.h"
+#include "plugin.h"

 #include "admin_conf.h"
 
 #define RPC_CONFIG_VERSION "Stargazer RPC v. 0.2"
 
 #include "admin_conf.h"
 
 #define RPC_CONFIG_VERSION "Stargazer RPC v. 0.2"
 

-extern "C" BASE_PLUGIN * GetPlugin();
+extern "C" PLUGIN * GetPlugin();

 
 class ADMINS;
 class TARIFFS;
 class USERS;
 
 class ADMINS;
 class TARIFFS;
 class USERS;

-class BASE_STORE;
+class STORE;

 
 class RPC_CONFIG_SETTINGS
 {
 
 class RPC_CONFIG_SETTINGS
 {


@@ -50,7 +50,7 @@ struct ADMIN_INFO
     PRIV        priviledges;
 };
 
     PRIV        priviledges;
 };
 

-class RPC_CONFIG :public BASE_PLUGIN
+class RPC_CONFIG :public PLUGIN

 {
 public:
     RPC_CONFIG();
 {
 public:
     RPC_CONFIG();


@@ -59,7 +59,7 @@ public:
     void                SetUsers(USERS * u) { users = u; }
     void                SetTariffs(TARIFFS * t) { tariffs = t; }
     void                SetAdmins(ADMINS * a) { admins = a; }
     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                SetStore(STORE * s) { store = s; }

     void                SetTraffcounter(TRAFFCOUNTER *) {}
     void                SetStgSettings(const SETTINGS * s) { stgSettings = s; }
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     void                SetTraffcounter(TRAFFCOUNTER *) {}
     void                SetStgSettings(const SETTINGS * s) { stgSettings = s; }
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }


@@ -83,12 +83,16 @@ public:
     bool                LogoutAdmin(const std::string & cookie);
 
 private:
     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;
     ADMINS *                admins;
     TARIFFS *               tariffs;
     mutable string          errorStr;
     RPC_CONFIG_SETTINGS     rpcConfigSettings;
     USERS *                 users;
     ADMINS *                admins;
     TARIFFS *               tariffs;

-    BASE_STORE *            store;
+    STORE *                 store;

     MODULE_SETTINGS         settings;
     const SETTINGS *        stgSettings;
     xmlrpc_c::registry      rpcRegistry;
     MODULE_SETTINGS         settings;
     const SETTINGS *        stgSettings;
     xmlrpc_c::registry      rpcRegistry;


@@ -98,10 +102,6 @@ private:
     pthread_t               tid;
     std::map<std::string,
              ADMIN_INFO>    cookies;
     pthread_t               tid;
     std::map<std::string,
              ADMIN_INFO>    cookies;

-
-    static void *           Run(void *);
-    std::string             GetCookie() const;
-    void                    InitiateRegistry();

 };
 
 #endif
 };
 
 #endif