From c26f4f6b17d688b3defb790486daf42392068aa3 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Thu, 7 Apr 2011 18:38:24 +0300 Subject: [PATCH 1/1] Fix rpcconfig plugin compilation errors --- .../configuration/rpcconfig/admins_methods.cpp | 3 +-- .../configuration/rpcconfig/admins_methods.h | 4 ++-- .../configuration/rpcconfig/info_methods.cpp | 4 ++-- .../configuration/rpcconfig/info_methods.h | 4 ++-- .../configuration/rpcconfig/messages_methods.cpp | 7 +++---- .../configuration/rpcconfig/messages_methods.h | 2 +- .../plugins/configuration/rpcconfig/rpcconfig.cpp | 11 +++++------ .../plugins/configuration/rpcconfig/rpcconfig.h | 8 ++++---- .../configuration/rpcconfig/tariff_helper.h | 2 +- .../configuration/rpcconfig/tariffs_methods.cpp | 10 +++++----- .../configuration/rpcconfig/user_helper.cpp | 13 ++++++------- .../plugins/configuration/rpcconfig/user_helper.h | 2 +- .../configuration/rpcconfig/users_methods.cpp | 15 +++++++-------- 13 files changed, 40 insertions(+), 45 deletions(-) diff --git a/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.cpp index f36debc4..2dbc9a7d 100644 --- 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 44941baa..d353c96d 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.h +++ b/projects/stargazer/plugins/configuration/rpcconfig/admins_methods.h @@ -4,8 +4,8 @@ #include #include -#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 a689cd99..e4a75a87 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp +++ b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp @@ -1,9 +1,9 @@ #include +#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 a404839b..60a2b319 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h +++ b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h @@ -7,8 +7,8 @@ #include #include -#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 b64e6615..695da284 100644 --- 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 b7afa472..2e5a2fdc 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.h +++ b/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.h @@ -4,7 +4,7 @@ #include #include -#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 6d09a2d2..a4890e2c 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp +++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp @@ -4,13 +4,12 @@ #include #include -#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 a597135a..da11d467 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h +++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h @@ -12,10 +12,10 @@ #include #include -#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 eb0fac30..955f810e 100644 --- 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 -#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 10985cce..76142053 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 "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 30205c92..00711e3d 100644 --- 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 ddc78444..83f70b5c 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.h +++ b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.h @@ -5,7 +5,7 @@ #include -#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 0c28c60b..ff783471 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp +++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp @@ -1,17 +1,16 @@ #include -#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" //------------------------------------------------------------------------------ -- 2.44.2