X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/82c7b78d7b7cf797f0663c96f44b092103802035..5f1252496dfef1724c21421ea470a04d09af7ad0:/stglibs/srvconf.lib/servconf.cpp?ds=sidebyside

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index a7663f0e..49d3ab73 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -22,6 +22,8 @@
 
 #include "netunit.h"
 #include "parser_auth_by.h"
+#include "parser_server_info.h"
+#include "parser_check_user.h"
 
 #include "stg/common.h"
 
@@ -43,8 +45,8 @@ public:
     int ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data);
     int AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data);
     int SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data);
-    int ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data);
-    int CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data);
+    int ServerInfo(SERVER_INFO::CALLBACK f, void * data);
+    int CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data);
 
     const std::string & GetStrError() const;
     static void Start(void * data, const char * el, const char ** attr);
@@ -54,9 +56,9 @@ private:
     PARSER_GET_USERS parserGetUsers;
     PARSER_GET_USER parserGetUser;
     AUTH_BY::PARSER parserAuthBy;
-    PARSER_SERVER_INFO  parserServerInfo;
+    SERVER_INFO::PARSER  parserServerInfo;
     PARSER_CHG_USER parserChgUser;
-    PARSER_CHECK_USER parserCheckUser;
+    CHECK_USER::PARSER parserCheckUser;
     PARSER_SEND_MESSAGE parserSendMessage;
 
     NETTRANSACT nt;
@@ -121,12 +123,12 @@ int SERVCONF::SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALL
     return pImpl->SendMessage(request, f, data);
 }
 
-int SERVCONF::ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data)
+int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data)
 {
     return pImpl->ServerInfo(f, data);
 }
 
-int SERVCONF::CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data)
+int SERVCONF::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data)
 {
     return pImpl->CheckUser(login, password, f, data);
 }
@@ -163,7 +165,7 @@ parserGetUsers.SetCallback(f, data);
 return Exec("<GetUsers/>", parserGetUsers);
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data)
+int SERVCONF::IMPL::ServerInfo(SERVER_INFO::CALLBACK f, void * data)
 {
 parserServerInfo.SetCallback(f, data);
 return Exec("<GetServerInfo/>", parserServerInfo);
@@ -181,7 +183,7 @@ parserSendMessage.SetCallback(f, data);
 return Exec(request, parserSendMessage);
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data)
+int SERVCONF::IMPL::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data)
 {
 parserCheckUser.SetCallback(f, data);
 return Exec("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", parserCheckUser);