Merge branch 'master' into naffanya-dev

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / user_helper.h

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.h b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.h
index ab5fd32f089857f47a4168ff2bcf58e44209878b..4e1dd7966f0a584be40ffc972779d2cdc9bfd525 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.h
@@ -5,29 +5,31 @@
 
 #include <xmlrpc-c/base.hpp>
 
 
 #include <xmlrpc-c/base.hpp>
 

-#include "../../../users.h"
+#include "stg/users.h"

 
 class ADMIN;
 
 class ADMIN;

-class BASE_STORE;
+class STORE;

 class TARIFFS;
 
 class USER_HELPER
 {
 public:
 class TARIFFS;
 
 class USER_HELPER
 {
 public:

-    USER_HELPER(user_iter & it)
-        : iter(it)
+    USER_HELPER(USER_PTR & p, USERS & us)
+        : ptr(p),
+          users(us)

     {
     }
 
     void GetUserInfo(xmlrpc_c::value * info,
                      bool hidePassword = false);
     bool SetUserInfo(const xmlrpc_c::value & info,
     {
     }
 
     void GetUserInfo(xmlrpc_c::value * info,
                      bool hidePassword = false);
     bool SetUserInfo(const xmlrpc_c::value & info,

-                     const ADMIN & admin,
+                     const ADMIN * admin,

                      const std::string & login,
                      const std::string & login,

-                     const BASE_STORE & store,
+                     const STORE & store,

                      TARIFFS * tariffs);
 private:
                      TARIFFS * tariffs);
 private:

-    user_iter & iter;
+    USER_PTR & ptr;
+    USERS & users;

 };
 
 #endif
 };
 
 #endif