Fix rpcconfig plugin compilation errors

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.cpp
index f36debc4dfa08e18c69778fbfa5b4c1be6dc271d..2dbc9a7d8405279bcf10cef09f89e967adb60f9e 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.cpp
@@ -1,7 +1,6 @@
+#include "stg/common.h"
 #include "admins_methods.h"
-
 #include "rpcconfig.h"
-#include "common.h"
 
 //------------------------------------------------------------------------------
 

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.h b/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.h
index 44941baaa8411079cfb27fb4ac98fd5b2f3db969..d353c96d78f7cdbef69a5f505a632a63aeb8cbaa 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 "stg/admins.h"
+#include "stg/admin.h"
 
 class RPC_CONFIG;
 

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
index a689cd99de2fa8370c7e791ca771aa78ed003dfd..e4a75a87ddca7acc1022b96a23e82add6a67bbda 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
@@ -1,9 +1,9 @@
 #include <sys/utsname.h>
 
+#include "stg/version.h"
+#include "stg/common.h"
 #include "info_methods.h"
-#include "version.h"
 #include "rpcconfig.h"
-#include "common.h"
 
 void METHOD_INFO::execute(xmlrpc_c::paramList const & paramList,
                           xmlrpc_c::value *   const   retvalPtr)

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h
index a404839bb827010afef84efc5a0b74dca7405f2e..60a2b3199dfcb244182ee8e36992dd8998d233cc 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h
@@ -7,8 +7,8 @@
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 
-#include "users.h"
-#include "tariffs.h"
+#include "stg/users.h"
+#include "stg/tariffs.h"
 
 // Forward declaration
 class RPC_CONFIG;

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp
index b64e661599aa3f02c62b418b3ccc406c51d8b9f7..695da284a52af3739ce041cd3a48589aa87a3783 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp
@@ -1,9 +1,8 @@
+#include "stg/stg_message.h"
+#include "stg/common.h"
+#include "utils.h"
 #include "messages_methods.h"
-
 #include "rpcconfig.h"
-#include "stg_message.h"
-#include "utils.h"
-#include "common.h"
 
 extern const volatile time_t stgTime;
 

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.h b/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.h
index b7afa472ff34a5c22f92580797599554e5b8aafd..2e5a2fdca1772e2a9d46509a78b5e6043abf099c 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 "stg/users.h"
 
 class RPC_CONFIG;
 

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
index 6d09a2d218bab194ef9d7c5c766575ada89978cf..a4890e2c36a00a6f905ecbf9e218ce4c7d6f6ec3 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
@@ -4,13 +4,12 @@
 #include <vector>
 #include <algorithm>
 
-#include "rpcconfig.h"
-
-#include "common.h"
-#include "admin.h"
-#include "module_settings.h"
-#include "settings.h"
+#include "stg/common.h"
+#include "stg/admin.h"
+#include "stg/module_settings.h"
+#include "stg/settings.h"
 
+#include "rpcconfig.h"
 #include "info_methods.h"
 #include "users_methods.h"
 #include "tariffs_methods.h"

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
index a597135a08b464bd15847e588d5537516c1fdb14..da11d46709c54488d405d0f046f01f8b72608e5e 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
@@ -12,10 +12,10 @@
 #include <xmlrpc-c/registry.hpp>
 #include <xmlrpc-c/server_abyss.hpp>
 
-#include "os_int.h"
-#include "plugin.h"
-#include "admin_conf.h"
-#include "module_settings.h"
+#include "stg/os_int.h"
+#include "stg/plugin.h"
+#include "stg/admin_conf.h"
+#include "stg/module_settings.h"
 
 #define RPC_CONFIG_VERSION "Stargazer RPC v. 0.2"
 

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/tariff_helper.h b/projects/stargazer/plugins/configuration/rpcconfig/tariff_helper.h
index eb0fac3055c9425bb21b1deb3c7eed82991bda60..955f810e1cd674305e3bb1d3b522d3e45cab508c 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/tariff_helper.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/tariff_helper.h
@@ -2,7 +2,7 @@
 #define __TARIFF_HELPER_H__
 
 #include <xmlrpc-c/base.hpp>
-#include "tariff_conf.h"
+#include "stg/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 10985cced4f65c70498895a7ebd584965dca6253..7614205346e72e83d128bea9068d89b58a96366c 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 "rpcconfig.h"
 #include "tariff_helper.h"
-#include "tariffs.h"
-#include "users.h"
-#include "admins.h"
-#include "admin.h"
+#include "stg/tariffs.h"
+#include "stg/users.h"
+#include "stg/admins.h"
+#include "stg/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/user_helper.cpp b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp
index 30205c9207049711486071b7d23423847df10b1e..00711e3df2f77853c99a783e4bad9af7b54d59af 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp
@@ -1,12 +1,11 @@
+#include "stg/tariffs.h"
+#include "stg/admin.h"
+#include "stg/store.h"
+#include "stg/user_ips.h"
+#include "stg/common.h"
+#include "stg/user_property.h"
 #include "user_helper.h"
-
-#include "tariffs.h"
-#include "admin.h"
-#include "store.h"
-#include "user_ips.h"
 #include "utils.h"
-#include "common.h"
-#include "user_property.h"
 
 //------------------------------------------------------------------------------
 

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.h b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.h
index ddc784441acb7a55725eee94d408f9bd0af0c7f1..83f70b5c4df2428cfabb48a296688c1ff2618604 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.h
@@ -5,7 +5,7 @@
 
 #include <xmlrpc-c/base.hpp>
 
-#include "users.h"
+#include "stg/users.h"
 
 class ADMIN;
 class STORE;

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
index 0c28c60bfa2aaba30836e3165663bb5b397ea39f..ff783471ab00f1d148439a2a2cafbb45498171a5 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
@@ -1,17 +1,16 @@
 #include <cerrno>
 
-#include "users_methods.h"
-
-#include "users.h"
-#include "admins.h"
-#include "tariffs.h"
+#include "stg/users.h"
+#include "stg/admins.h"
+#include "stg/tariffs.h"
+#include "stg/user_ips.h"
+#include "stg/common.h"
+#include "stg/user_property.h"
 
+#include "users_methods.h"
 #include "rpcconfig.h"
 #include "user_helper.h"
-#include "user_ips.h"
 #include "utils.h"
-#include "common.h"
-#include "user_property.h"
 
 //------------------------------------------------------------------------------