Fixed merge issues.

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

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h
index b381d16ca24e92a978eb2a5dd16cd47b37f4ac40..cb72bbf751dffbd6cec753597ddd0b06ca6303f6 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h
@@ -1,11 +1,14 @@
 #ifndef __INFO_METHODS_H__
 #define __INFO_METHODS_H__
 
 #ifndef __INFO_METHODS_H__
 #define __INFO_METHODS_H__
 

+#include <string>
+#include <vector>
+

 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 

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

 
 // Forward declaration
 class RPC_CONFIG;
 
 // Forward declaration
 class RPC_CONFIG;


@@ -16,19 +19,26 @@ class METHOD_INFO : public xmlrpc_c::method
 public:
     METHOD_INFO(TARIFFS * t,
                 USERS * u,
 public:
     METHOD_INFO(TARIFFS * t,
                 USERS * u,

-                const SETTINGS * s)
+                size_t df,
+                const std::vector<std::string> & dn)

         : tariffs(t),
           users(u),
         : tariffs(t),
           users(u),

-          settings(s)
+          dayFee(df),
+          dirNames(dn)

     {
     }
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
     {
     }
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);

+

 private:
 private:

+    METHOD_INFO(const METHOD_INFO & rvalue);
+    METHOD_INFO & operator=(const METHOD_INFO & rvalue);
+

     TARIFFS * tariffs;
     USERS * users;
     TARIFFS * tariffs;
     USERS * users;

-    const SETTINGS * settings;
+    size_t dayFee;
+    const std::vector<std::string> & dirNames;

 };
 
 class METHOD_LOGIN : public xmlrpc_c::method
 };
 
 class METHOD_LOGIN : public xmlrpc_c::method


@@ -41,7 +51,11 @@ public:
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);

+

 private:
 private:

+    METHOD_LOGIN(const METHOD_LOGIN & rvalue);
+    METHOD_LOGIN & operator=(const METHOD_LOGIN & rvalue);
+

     RPC_CONFIG * config;
 };
 
     RPC_CONFIG * config;
 };
 


@@ -55,7 +69,11 @@ public:
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);

+

 private:
 private:

+    METHOD_LOGOUT(const METHOD_LOGOUT & rvalue);
+    METHOD_LOGOUT & operator=(const METHOD_LOGOUT & rvalue);
+

     RPC_CONFIG * config;
 };
 
     RPC_CONFIG * config;
 };