Use std::jthread and C++17.

[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 60a2b3199dfcb244182ee8e36992dd8998d233cc..709a0666ad6d22b37d9e536e62adab68731a9450 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.h
@@ -1,24 +1,28 @@
-#ifndef __INFO_METHODS_H__
-#define __INFO_METHODS_H__
+#pragma once
+
+#include <xmlrpc-c/base.hpp>
+#include <xmlrpc-c/registry.hpp>

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

-#include <xmlrpc-c/base.hpp>
-#include <xmlrpc-c/registry.hpp>
+namespace STG
+{
+
+struct Settings;
+struct Users;
+struct Tariffs;

 
 

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

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

-class SETTINGS;

 
 class METHOD_INFO : public xmlrpc_c::method
 {
 public:
 
 class METHOD_INFO : public xmlrpc_c::method
 {
 public:

-    METHOD_INFO(TARIFFS * t,
-                USERS * u,
+    METHOD_INFO(STG::Tariffs * t,
+                STG::Users * u,

                 size_t df,
                 const std::vector<std::string> & dn)
         : tariffs(t),
                 size_t df,
                 const std::vector<std::string> & dn)
         : tariffs(t),


@@ -30,9 +34,13 @@ 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:

-    TARIFFS * tariffs;
-    USERS * users;
+    METHOD_INFO(const METHOD_INFO & rvalue);
+    METHOD_INFO & operator=(const METHOD_INFO & rvalue);
+
+    STG::Tariffs * tariffs;
+    STG::Users * users;

     size_t dayFee;
     const std::vector<std::string> & dirNames;
 };
     size_t dayFee;
     const std::vector<std::string> & dirNames;
 };


@@ -40,29 +48,35 @@ private:
 class METHOD_LOGIN : public xmlrpc_c::method
 {
 public:
 class METHOD_LOGIN : public xmlrpc_c::method
 {
 public:

-    METHOD_LOGIN(RPC_CONFIG * c)
+    explicit METHOD_LOGIN(RPC_CONFIG * c)

         : config(c)
     {
     }
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
         : config(c)
     {
     }
 
     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;
 };
 
 class METHOD_LOGOUT : public xmlrpc_c::method
 {
 public:
     RPC_CONFIG * config;
 };
 
 class METHOD_LOGOUT : public xmlrpc_c::method
 {
 public:

-    METHOD_LOGOUT(RPC_CONFIG * c)
+    explicit METHOD_LOGOUT(RPC_CONFIG * c)

         : config(c)
     {
     }
 
     void execute(xmlrpc_c::paramList const & paramList,
                  xmlrpc_c::value *   const   retvalP);
         : config(c)
     {
     }
 
     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;
 };

-
-#endif