Fixed formatting.

[stg.git] / stglibs / srvconf.lib / include / stg / servconf.h

diff --git a/stglibs/srvconf.lib/include/stg/servconf.h b/stglibs/srvconf.lib/include/stg/servconf.h
index f2afda398e54388f367191de0c451f8c66af2557..2a2dbcaac0a13af69badfc3143eb3fd023c6fbb5 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -49,7 +49,7 @@ public:
 
     int RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data);
 
 
     int RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data);
 

-    int GetAdmins(GET_ADMINS::CALLBACK f, void * data);
+    int GetAdmins(GET_CONTAINER::CALLBACK<GET_ADMIN::INFO>::TYPE f, void * data);

     int GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data);
     int ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddAdmin(const std::string & login,
     int GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data);
     int ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddAdmin(const std::string & login,


@@ -57,7 +57,7 @@ public:
                  SIMPLE::CALLBACK f, void * data);
     int DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data);
 
                  SIMPLE::CALLBACK f, void * data);
     int DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data);
 

-    int GetTariffs(GET_TARIFFS::CALLBACK f, void * data);
+    int GetTariffs(GET_CONTAINER::CALLBACK<GET_TARIFF::INFO>::TYPE f, void * data);

     int GetTariff(const std::string & name, GET_TARIFF::CALLBACK f, void * data);
     int ChgTariff(const TARIFF_DATA_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddTariff(const std::string & name,
     int GetTariff(const std::string & name, GET_TARIFF::CALLBACK f, void * data);
     int ChgTariff(const TARIFF_DATA_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddTariff(const std::string & name,


@@ -65,7 +65,7 @@ public:
                   SIMPLE::CALLBACK f, void * data);
     int DelTariff(const std::string & name, SIMPLE::CALLBACK f, void * data);
 
                   SIMPLE::CALLBACK f, void * data);
     int DelTariff(const std::string & name, SIMPLE::CALLBACK f, void * data);
 

-    int GetUsers(GET_USERS::CALLBACK f, void * data);
+    int GetUsers(GET_CONTAINER::CALLBACK<GET_USER::INFO>::TYPE f, void * data);

     int GetUser(const std::string & login, GET_USER::CALLBACK f, void * data);
     int ChgUser(const std::string & login,
                 const USER_CONF_RES & conf,
     int GetUser(const std::string & login, GET_USER::CALLBACK f, void * data);
     int ChgUser(const std::string & login,
                 const USER_CONF_RES & conf,


@@ -77,7 +77,7 @@ public:
     int SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data);
     int CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data);
 
     int SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data);
     int CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data);
 

-    int GetServices(GET_SERVICES::CALLBACK f, void * data);
+    int GetServices(GET_CONTAINER::CALLBACK<GET_SERVICE::INFO>::TYPE f, void * data);

     int GetService(const std::string & name, GET_SERVICE::CALLBACK f, void * data);
     int ChgService(const SERVICE_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddService(const std::string & name,
     int GetService(const std::string & name, GET_SERVICE::CALLBACK f, void * data);
     int ChgService(const SERVICE_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddService(const std::string & name,


@@ -85,7 +85,7 @@ public:
                    SIMPLE::CALLBACK f, void * data);
     int DelService(const std::string & name, SIMPLE::CALLBACK f, void * data);
 
                    SIMPLE::CALLBACK f, void * data);
     int DelService(const std::string & name, SIMPLE::CALLBACK f, void * data);
 

-    int GetCorporations(GET_CORPORATIONS::CALLBACK f, void * data);
+    int GetCorporations(GET_CONTAINER::CALLBACK<GET_CORP::INFO>::TYPE f, void * data);

     int GetCorp(const std::string & name, GET_CORP::CALLBACK f, void * data);
     int ChgCorp(const CORP_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddCorp(const std::string & name,
     int GetCorp(const std::string & name, GET_CORP::CALLBACK f, void * data);
     int ChgCorp(const CORP_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddCorp(const std::string & name,