Уменьшена зависимостть между заголовочными файлами путем использования

forward declaration

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
index c059ba6142f70b3cbee587c9366dae269a252197..46905b15366e539b319ad4010cf72b72e1156e6a 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
@@ -1,7 +1,17 @@
-#include "rpcconfig.h"
-

 #include <cstdlib>
 #include <csignal>
 #include <cstdlib>
 #include <csignal>

+
+#include "rpcconfig.h"
+
+#include "../../../admin.h"
+#include "../../../admins.h"
+#include "../../../users.h"
+#include "../../../tariffs.h"
+#include "../../../traffcounter.h"
+#include "../../../settings.h"
+#include "base_store.h"
+#include "base_settings.h"
+

 #include "info_methods.h"
 #include "users_methods.h"
 #include "tariffs_methods.h"
 #include "info_methods.h"
 #include "users_methods.h"
 #include "tariffs_methods.h"


@@ -311,6 +321,7 @@ rpcRegistry.addMethod("stargazer.get_users", methodGetUsersPtr);
 xmlrpc_c::methodPtr const methodChgUserPtr(new METHOD_USER_CHG(
             this,
             admins,
 xmlrpc_c::methodPtr const methodChgUserPtr(new METHOD_USER_CHG(
             this,
             admins,

+            tariffs,

             store,
             users
             ));
             store,
             users
             ));

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
index 170f8e33726244f0d83268dd936785fd88bdd54c..21a8a3d49160221ce1d534d25a1448db8534169b 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
@@ -13,20 +13,17 @@
 
 #include "os_int.h"
 #include "base_plugin.h"
 
 #include "os_int.h"
 #include "base_plugin.h"

-#include "base_store.h"
-#include "base_settings.h"

 #include "admin_conf.h"
 #include "admin_conf.h"

-#include "../../../admin.h"
-#include "../../../admins.h"
-#include "../../../users.h"
-#include "../../../tariffs.h"
-#include "../../../traffcounter.h"
-#include "../../../settings.h"

 
 #define RPC_CONFIG_VERSION "Stargazer RPC v. 0.2"
 
 extern "C" BASE_PLUGIN * GetPlugin();
 
 
 #define RPC_CONFIG_VERSION "Stargazer RPC v. 0.2"
 
 extern "C" BASE_PLUGIN * GetPlugin();
 

+class ADMINS;
+class TARIFFS;
+class USERS;
+class BASE_STORE;
+

 class RPC_CONFIG_SETTINGS
 {
 public:
 class RPC_CONFIG_SETTINGS
 {
 public:

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
index 36194e3682f4c43c6b1f522cb81f63537c53d0a8..23916ae70868e334e5cefddc52e2c9ba5db79270 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
@@ -1,6 +1,10 @@
 #include "rpcconfig.h"
 #include "tariffs_methods.h"
 #include "tariff_helper.h"
 #include "rpcconfig.h"
 #include "tariffs_methods.h"
 #include "tariff_helper.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)
 
 void METHOD_TARIFF_GET::execute(xmlrpc_c::paramList const & paramList,
                                 xmlrpc_c::value *   const   retvalPtr)

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.h b/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.h
index fdd788d4312ccb7a60dc8d9db3075c448703a60b..3f99b349678ea186af65c811b9b5ec558b5e1d07 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.h
@@ -4,9 +4,10 @@
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 

-#include "../../../tariffs.h"
-

 class RPC_CONFIG;
 class RPC_CONFIG;

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

 
 class METHOD_TARIFF_GET : public xmlrpc_c::method {
 public:
 
 class METHOD_TARIFF_GET : public xmlrpc_c::method {
 public: