Revert "Merge remote-tracking branch 'origin/master' into ticket37"

[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 ddc784441acb7a55725eee94d408f9bd0af0c7f1..4e1dd7966f0a584be40ffc972779d2cdc9bfd525 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 <xmlrpc-c/base.hpp>
 

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

 
 class ADMIN;
 class STORE;
 
 class ADMIN;
 class STORE;


@@ -14,8 +14,9 @@ class TARIFFS;
 class USER_HELPER
 {
 public:
 class USER_HELPER
 {
 public:

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

     {
     }
 
     {
     }
 


@@ -28,6 +29,7 @@ public:
                      TARIFFS * tariffs);
 private:
     USER_PTR & ptr;
                      TARIFFS * tariffs);
 private:
     USER_PTR & ptr;

+    USERS & users;

 };
 
 #endif
 };
 
 #endif