Some more BSD-related issues.

[stg.git] / stargazer / plugins / configuration / rpcconfig / tariffs_methods.h

diff --git a/stargazer/plugins/configuration/rpcconfig/tariffs_methods.h b/stargazer/plugins/configuration/rpcconfig/tariffs_methods.h
index d43840d0db2d7cb6534d4647e5c1306f26c2bb2c..4f4d6680cdf8c90b5fd266edea961de83e1e9e2b 100644 (file)
--- a/stargazer/plugins/configuration/rpcconfig/tariffs_methods.h
+++ b/stargazer/plugins/configuration/rpcconfig/tariffs_methods.h
@@ -1,18 +1,23 @@
-#ifndef __TARIFFS_METHODS_H__
-#define __TARIFFS_METHODS_H__
+#pragma once

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

+namespace STG
+{
+
+struct Tariffs;
+struct Users;
+struct Admins;
+
+}
+

 class RPC_CONFIG;
 class RPC_CONFIG;

-class TARIFFS;
-class USERS;
-class ADMINS;

 
 class METHOD_TARIFF_GET : public xmlrpc_c::method {
 public:
     METHOD_TARIFF_GET(RPC_CONFIG * c,
 
 class METHOD_TARIFF_GET : public xmlrpc_c::method {
 public:
     METHOD_TARIFF_GET(RPC_CONFIG * c,

-                      TARIFFS * t)
+                      STG::Tariffs * t)

         : config(c),
           tariffs(t)
     {
         : config(c),
           tariffs(t)
     {


@@ -26,14 +31,14 @@ private:
     METHOD_TARIFF_GET & operator=(const METHOD_TARIFF_GET & rvalue);
 
     RPC_CONFIG * config;
     METHOD_TARIFF_GET & operator=(const METHOD_TARIFF_GET & rvalue);
 
     RPC_CONFIG * config;

-    TARIFFS * tariffs;
+    STG::Tariffs * tariffs;

 };
 
 class METHOD_TARIFF_CHG : public xmlrpc_c::method {
 public:
     METHOD_TARIFF_CHG(RPC_CONFIG * c,
 };
 
 class METHOD_TARIFF_CHG : public xmlrpc_c::method {
 public:
     METHOD_TARIFF_CHG(RPC_CONFIG * c,

-                      ADMINS * a,
-                      TARIFFS * t)
+                      STG::Admins * a,
+                      STG::Tariffs * t)

         : config(c),
           admins(a),
           tariffs(t)
         : config(c),
           admins(a),
           tariffs(t)


@@ -48,14 +53,14 @@ private:
     METHOD_TARIFF_CHG & operator=(const METHOD_TARIFF_CHG & rvalue);
 
     RPC_CONFIG * config;
     METHOD_TARIFF_CHG & operator=(const METHOD_TARIFF_CHG & rvalue);
 
     RPC_CONFIG * config;

-    ADMINS * admins;
-    TARIFFS * tariffs;
+    STG::Admins * admins;
+    STG::Tariffs * tariffs;

 };
 
 class METHOD_TARIFFS_GET : public xmlrpc_c::method {
 public:
     METHOD_TARIFFS_GET(RPC_CONFIG * c,
 };
 
 class METHOD_TARIFFS_GET : public xmlrpc_c::method {
 public:
     METHOD_TARIFFS_GET(RPC_CONFIG * c,

-                      TARIFFS * t)
+                      STG::Tariffs * t)

         : config(c),
           tariffs(t)
     {
         : config(c),
           tariffs(t)
     {


@@ -69,14 +74,14 @@ private:
     METHOD_TARIFFS_GET & operator=(const METHOD_TARIFFS_GET & rvalue);
 
     RPC_CONFIG * config;
     METHOD_TARIFFS_GET & operator=(const METHOD_TARIFFS_GET & rvalue);
 
     RPC_CONFIG * config;

-    TARIFFS * tariffs;
+    STG::Tariffs * tariffs;

 };
 
 class METHOD_TARIFF_ADD : public xmlrpc_c::method {
 public:
     METHOD_TARIFF_ADD(RPC_CONFIG * c,
 };
 
 class METHOD_TARIFF_ADD : public xmlrpc_c::method {
 public:
     METHOD_TARIFF_ADD(RPC_CONFIG * c,

-                      ADMINS * a,
-                      TARIFFS * t)
+                      STG::Admins * a,
+                      STG::Tariffs * t)

         : config(c),
           admins(a),
           tariffs(t)
         : config(c),
           admins(a),
           tariffs(t)


@@ -91,16 +96,16 @@ private:
     METHOD_TARIFF_ADD & operator=(const METHOD_TARIFF_ADD & rvalue);
 
     RPC_CONFIG * config;
     METHOD_TARIFF_ADD & operator=(const METHOD_TARIFF_ADD & rvalue);
 
     RPC_CONFIG * config;

-    ADMINS * admins;
-    TARIFFS * tariffs;
+    STG::Admins * admins;
+    STG::Tariffs * tariffs;

 };
 
 class METHOD_TARIFF_DEL : public xmlrpc_c::method {
 public:
     METHOD_TARIFF_DEL(RPC_CONFIG * c,
 };
 
 class METHOD_TARIFF_DEL : public xmlrpc_c::method {
 public:
     METHOD_TARIFF_DEL(RPC_CONFIG * c,

-                      ADMINS * a,
-                      TARIFFS * t,
-                      USERS * u)
+                      STG::Admins * a,
+                      STG::Tariffs * t,
+                      STG::Users * u)

         : config(c),
           admins(a),
           tariffs(t),
         : config(c),
           admins(a),
           tariffs(t),


@@ -116,9 +121,7 @@ private:
     METHOD_TARIFF_DEL & operator=(const METHOD_TARIFF_DEL & rvalue);
 
     RPC_CONFIG * config;
     METHOD_TARIFF_DEL & operator=(const METHOD_TARIFF_DEL & rvalue);
 
     RPC_CONFIG * config;

-    ADMINS * admins;
-    TARIFFS * tariffs;
-    USERS * users;
+    STG::Admins * admins;
+    STG::Tariffs * tariffs;
+    STG::Users * users;

 };
 };

-
-#endif