From bdd487e027c6f6c752eacc71aa75055e1323cd7f Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust.madf@gmail.com>
Date: Fri, 18 Mar 2011 20:23:34 +0200
Subject: [PATCH] Fix paths to interface classes in XML RPC plugin

---
 .../plugins/configuration/rpcconfig/admins_methods.h      | 4 ++--
 .../plugins/configuration/rpcconfig/info_methods.h        | 6 +++---
 .../plugins/configuration/rpcconfig/messages_methods.h    | 2 +-
 .../stargazer/plugins/configuration/rpcconfig/rpcconfig.h | 6 +++---
 .../plugins/configuration/rpcconfig/tariff_helper.h       | 1 -
 .../plugins/configuration/rpcconfig/tariffs_methods.cpp   | 8 ++++----
 .../plugins/configuration/rpcconfig/users_methods.cpp     | 6 +++---
 7 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.h b/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.h
index 7c5ceb10..44941baa 100644
--- 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 37bbb40d..b381d16c 100644
--- 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 c82ad13e..b7afa472 100644
--- 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 58e8973a..4c4b6b3b 100644
--- 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 e7b1c6df..eb0fac30 100644
--- 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 23916ae7..16e25eb8 100644
--- 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 fd9f86be..35166c81 100644
--- 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"
-- 
2.44.2