Use std::lock_guard instead of STG_LOCKER.

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

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.h b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.h
index d1ec33a4ade340f07e1612e1b9641de38417db8d..bd17c4567e0323d4afa179c684f495b9736f5c0d 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.h
@@ -1,20 +1,25 @@
-#ifndef __USERS_METHODS_H__
-#define __USERS_METHODS_H__
+#pragma once
 
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 
+namespace STG
+{
+
+struct Admins;
+class Tariffs;
+class Users;
+struct Store;
+struct IPMask;
+
+}
+
 class RPC_CONFIG;
-class ADMINS;
-class TARIFFS;
-class USERS;
-class STORE;
-struct IP_MASK;
 
 class METHOD_USER_GET : public xmlrpc_c::method {
 public:
     METHOD_USER_GET(RPC_CONFIG * c,
-                    USERS * u)
+                    STG::Users * u)
         : config(c),
           users(u)
     {
@@ -28,14 +33,14 @@ private:
     METHOD_USER_GET & operator=(const METHOD_USER_GET & rvalue);
 
     RPC_CONFIG * config;
-    USERS * users;
+    STG::Users * users;
 };
 
 class METHOD_USER_ADD : public xmlrpc_c::method {
 public:
     METHOD_USER_ADD(RPC_CONFIG * c,
-                    ADMINS * a,
-                    USERS * u)
+                    STG::Admins * a,
+                    STG::Users * u)
         : config(c),
           admins(a),
           users(u)
@@ -50,15 +55,15 @@ private:
     METHOD_USER_ADD & operator=(const METHOD_USER_ADD & rvalue);
 
     RPC_CONFIG * config;
-    ADMINS * admins;
-    USERS * users;
+    STG::Admins * admins;
+    STG::Users * users;
 };
 
 class METHOD_USER_DEL : public xmlrpc_c::method {
 public:
     METHOD_USER_DEL(RPC_CONFIG * c,
-                    ADMINS * a,
-                    USERS * u)
+                    STG::Admins * a,
+                    STG::Users * u)
         : config(c),
           admins(a),
           users(u)
@@ -73,14 +78,14 @@ private:
     METHOD_USER_DEL & operator=(const METHOD_USER_DEL & rvalue);
 
     RPC_CONFIG * config;
-    ADMINS * admins;
-    USERS * users;
+    STG::Admins * admins;
+    STG::Users * users;
 };
 
 class METHOD_USERS_GET : public xmlrpc_c::method {
 public:
     METHOD_USERS_GET(RPC_CONFIG * c,
-                     USERS * u)
+                     STG::Users * u)
         : config(c),
           users(u)
     {
@@ -94,16 +99,16 @@ private:
     METHOD_USERS_GET & operator=(const METHOD_USERS_GET & rvalue);
 
     RPC_CONFIG * config;
-    USERS * users;
+    STG::Users * users;
 };
 
 class METHOD_USER_CHG : public xmlrpc_c::method {
 public:
     METHOD_USER_CHG(RPC_CONFIG * c,
-                    ADMINS * a,
-                    TARIFFS * t,
-                    STORE * s,
-                    USERS * u)
+                    STG::Admins * a,
+                    STG::Tariffs * t,
+                    STG::Store * s,
+                    STG::Users * u)
         : config(c),
           admins(a),
           tariffs(t),
@@ -120,18 +125,18 @@ private:
     METHOD_USER_CHG & operator=(const METHOD_USER_CHG & rvalue);
 
     RPC_CONFIG * config;
-    ADMINS * admins;
-    TARIFFS * tariffs;
-    STORE * store;
-    USERS * users;
+    STG::Admins * admins;
+    STG::Tariffs * tariffs;
+    STG::Store * store;
+    STG::Users * users;
 };
 
 class METHOD_USER_CASH_ADD : public xmlrpc_c::method {
 public:
     METHOD_USER_CASH_ADD(RPC_CONFIG * c,
-                         ADMINS * a,
-                         STORE * s,
-                         USERS * u)
+                         STG::Admins * a,
+                         STG::Store * s,
+                         STG::Users * u)
         : config(c),
           admins(a),
           store(s),
@@ -147,17 +152,17 @@ private:
     METHOD_USER_CASH_ADD & operator=(const METHOD_USER_CASH_ADD & rvalue);
 
     RPC_CONFIG * config;
-    ADMINS * admins;
-    STORE * store;
-    USERS * users;
+    STG::Admins * admins;
+    STG::Store * store;
+    STG::Users * users;
 };
 
 class METHOD_USER_CASH_SET : public xmlrpc_c::method {
 public:
     METHOD_USER_CASH_SET(RPC_CONFIG * c,
-                         ADMINS * a,
-                         STORE * s,
-                         USERS * u)
+                         STG::Admins * a,
+                         STG::Store * s,
+                         STG::Users * u)
         : config(c),
           admins(a),
           store(s),
@@ -173,18 +178,18 @@ private:
     METHOD_USER_CASH_SET & operator=(const METHOD_USER_CASH_SET & rvalue);
 
     RPC_CONFIG * config;
-    ADMINS * admins;
-    STORE * store;
-    USERS * users;
+    STG::Admins * admins;
+    STG::Store * store;
+    STG::Users * users;
 };
 
 class METHOD_USER_TARIFF_CHANGE : public xmlrpc_c::method {
 public:
     METHOD_USER_TARIFF_CHANGE(RPC_CONFIG * c,
-                              ADMINS * a,
-                              TARIFFS * t,
-                              STORE * s,
-                              USERS * u)
+                              STG::Admins * a,
+                              STG::Tariffs * t,
+                              STG::Store * s,
+                              STG::Users * u)
         : config(c),
           admins(a),
           tariffs(t),
@@ -201,16 +206,16 @@ private:
     METHOD_USER_TARIFF_CHANGE & operator=(const METHOD_USER_TARIFF_CHANGE & rvalue);
 
     RPC_CONFIG * config;
-    ADMINS * admins;
-    TARIFFS * tariffs;
-    STORE * store;
-    USERS * users;
+    STG::Admins * admins;
+    STG::Tariffs * tariffs;
+    STG::Store * store;
+    STG::Users * users;
 };
 
 class METHOD_GET_ONLINE_IPS : public xmlrpc_c::method {
 public:
     METHOD_GET_ONLINE_IPS(RPC_CONFIG * c,
-                          USERS * u)
+                          STG::Users * u)
         : config(c),
           users(u)
     {
@@ -224,15 +229,15 @@ private:
     METHOD_GET_ONLINE_IPS & operator=(const METHOD_GET_ONLINE_IPS & rvalue);
 
     RPC_CONFIG * config;
-    USERS * users;
+    STG::Users * users;
 
-    bool ParseNet(const std::string & net, IP_MASK & ipm) const;
+    bool ParseNet(const std::string & net, STG::IPMask & ipm) const;
 };
 
 class METHOD_GET_USER_AUTH_BY : public xmlrpc_c::method {
 public:
     METHOD_GET_USER_AUTH_BY(RPC_CONFIG * c,
-                            USERS * u)
+                            STG::Users * u)
         : config(c),
           users(u)
     {
@@ -246,7 +251,5 @@ private:
     METHOD_GET_USER_AUTH_BY & operator=(const METHOD_GET_ONLINE_IPS & rvalue);
 
     RPC_CONFIG * config;
-    USERS * users;
+    STG::Users * users;
 };
-
-#endif