Fix paths to interface classes in XML RPC plugin

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.h b/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.h
index 7c5ceb10bf4908002cb133d41fdcb7ce4795c2dd..44941baaa8411079cfb27fb4ac98fd5b2f3db969 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.h
@@ -4,8 +4,8 @@
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 
-#include "../../../admins.h"
-#include "../../../admin.h"
+#include "admins.h"
+#include "admin.h"
 
 class RPC_CONFIG;
 

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h
index 37bbb40d81c815425dfcdf34398d0af33f860814..b381d16ca24e92a978eb2a5dd16cd47b37f4ac40 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h
@@ -4,12 +4,12 @@
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 
-#include "../../../users.h"
-#include "../../../tariffs.h"
-#include "../../../settings.h"
+#include "users.h"
+#include "tariffs.h"
 
 // Forward declaration
 class RPC_CONFIG;
+class SETTINGS;
 
 class METHOD_INFO : public xmlrpc_c::method
 {

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.h b/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.h
index c82ad13edb7d89a085db5462db1264060642e80e..b7afa472ff34a5c22f92580797599554e5b8aafd 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.h
@@ -4,7 +4,7 @@
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 
-#include "../../../users.h"
+#include "users.h"
 
 class RPC_CONFIG;
 

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
index 58e8973a44e4c9d2c7e7ce2a542dcdcbbeebf1b8..4c4b6b3bbdbbf1c441e1b71fa07ce1f4f6970cad 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
@@ -70,8 +70,8 @@ public:
     int                 Reload() { return 0; }
     bool                IsRunning() { return running && !stopped; }
 
-    const string      & GetStrError() const { return errorStr; }
-    const string        GetVersion() const { return RPC_CONFIG_VERSION; }
+    const std::string & GetStrError() const { return errorStr; }
+    const std::string   GetVersion() const { return RPC_CONFIG_VERSION; }
     uint16_t            GetStartPosition() const { return 220; }
     uint16_t            GetStopPosition() const { return 220; }
 
@@ -87,7 +87,7 @@ private:
     std::string             GetCookie() const;
     void                    InitiateRegistry();
 
-    mutable string          errorStr;
+    mutable std::string     errorStr;
     RPC_CONFIG_SETTINGS     rpcConfigSettings;
     USERS *                 users;
     ADMINS *                admins;

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/tariff_helper.h b/projects/stargazer/plugins/configuration/rpcconfig/tariff_helper.h
index e7b1c6df8b4af649df301e310d2d61dba48c30e2..eb0fac3055c9425bb21b1deb3c7eed82991bda60 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/tariff_helper.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/tariff_helper.h
@@ -2,7 +2,6 @@
 #define __TARIFF_HELPER_H__
 
 #include <xmlrpc-c/base.hpp>
-#include "../../../tariff.h"
 #include "tariff_conf.h"
 
 class TARIFF_HELPER

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
index 23916ae70868e334e5cefddc52e2c9ba5db79270..16e25eb89d5dfebfe4edfc55a9f3d4a54fac3f9f 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
@@ -1,10 +1,10 @@
 #include "rpcconfig.h"
 #include "tariffs_methods.h"
 #include "tariff_helper.h"
-#include "../../../tariffs.h"
-#include "../../../users.h"
-#include "../../../admins.h"
-#include "../../../admin.h"
+#include "tariffs.h"
+#include "users.h"
+#include "admins.h"
+#include "admin.h"
 
 void METHOD_TARIFF_GET::execute(xmlrpc_c::paramList const & paramList,
                                 xmlrpc_c::value *   const   retvalPtr)

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
index fd9f86be3beec117fe7c752c8755d4204f27fa03..35166c8154ed315a395205a84bfd04e32e003f03 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
@@ -2,9 +2,9 @@
 
 #include "users_methods.h"
 
-#include "../../../users.h"
-#include "../../../admins.h"
-#include "../../../tariffs.h"
+#include "users.h"
+#include "admins.h"
+#include "tariffs.h"
 
 #include "rpcconfig.h"
 #include "user_helper.h"