From 70778b6263943f67b0e85aa50a16d48805d714e5 Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust@gts.dp.ua>
Date: Fri, 26 Nov 2010 17:03:50 +0200
Subject: [PATCH] =?utf8?q?=D0=A3=D0=BC=D0=B5=D0=BD=D1=8C=D1=88=D0=B5=D0=BD?=
 =?utf8?q?=D0=B0=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81?=
 =?utf8?q?=D1=82=D1=82=D1=8C=20=D0=BC=D0=B5=D0=B6=D0=B4=D1=83=20=D0=B7?=
 =?utf8?q?=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BE=D1=87=D0=BD=D1=8B?=
 =?utf8?q?=D0=BC=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=D0=BC=D0=B8=20?=
 =?utf8?q?=D0=BF=D1=83=D1=82=D0=B5=D0=BC=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB?=
 =?utf8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20forward=20dec?=
 =?utf8?q?laration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../plugins/configuration/rpcconfig/rpcconfig.cpp | 15 +++++++++++++--
 .../plugins/configuration/rpcconfig/rpcconfig.h   | 13 +++++--------
 .../configuration/rpcconfig/tariffs_methods.cpp   |  4 ++++
 .../configuration/rpcconfig/tariffs_methods.h     |  5 +++--
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
index c059ba61..46905b15 100644
--- 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 "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"
@@ -311,6 +321,7 @@ rpcRegistry.addMethod("stargazer.get_users", methodGetUsersPtr);
 xmlrpc_c::methodPtr const methodChgUserPtr(new METHOD_USER_CHG(
             this,
             admins,
+            tariffs,
             store,
             users
             ));
diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
index 170f8e33..21a8a3d4 100644
--- 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 "base_store.h"
-#include "base_settings.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();
 
+class ADMINS;
+class TARIFFS;
+class USERS;
+class BASE_STORE;
+
 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 36194e36..23916ae7 100644
--- 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 "../../../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/tariffs_methods.h b/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.h
index fdd788d4..3f99b349 100644
--- 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 "../../../tariffs.h"
-
 class RPC_CONFIG;
+class TARIFFS;
+class USERS;
+class ADMINS;
 
 class METHOD_TARIFF_GET : public xmlrpc_c::method {
 public:
-- 
2.43.2