From 7e142f5d0a61138473602352e38c6f5a5e4bba61 Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sat, 10 Aug 2013 22:55:38 +0300
Subject: [PATCH 1/1] Removed "stg" prefix from inclusion of parser.h
---
stglibs/srvconf.lib/include/stg/parser_auth_by.h | 2 +-
.../srvconf.lib/include/stg/parser_check_user.h | 2 +-
stglibs/srvconf.lib/include/stg/parser_get_user.h | 2 +-
.../srvconf.lib/include/stg/parser_get_users.h | 2 +-
.../srvconf.lib/include/stg/parser_server_info.h | 2 +-
stglibs/srvconf.lib/include/stg/servconf.h | 15 ---------------
6 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/stglibs/srvconf.lib/include/stg/parser_auth_by.h b/stglibs/srvconf.lib/include/stg/parser_auth_by.h
index b9f33cf3..aa3ea7bc 100644
--- a/stglibs/srvconf.lib/include/stg/parser_auth_by.h
+++ b/stglibs/srvconf.lib/include/stg/parser_auth_by.h
@@ -21,7 +21,7 @@
#ifndef __STG_STGLIBS_SRVCONF_PARSER_AUTH_BY_H__
#define __STG_STGLIBS_SRVCONF_PARSER_AUTH_BY_H__
-#include "stg/parser.h"
+#include "parser.h"
#include <vector>
#include <string>
diff --git a/stglibs/srvconf.lib/include/stg/parser_check_user.h b/stglibs/srvconf.lib/include/stg/parser_check_user.h
index 55d5531e..8088a0c0 100644
--- a/stglibs/srvconf.lib/include/stg/parser_check_user.h
+++ b/stglibs/srvconf.lib/include/stg/parser_check_user.h
@@ -22,7 +22,7 @@
#ifndef __STG_STGLIBS_SRVCONF_PARSER_CHECK_USER_H__
#define __STG_STGLIBS_SRVCONF_PARSER_CHECK_USER_H__
-#include "stg/parser.h"
+#include "parser.h"
class PARSER_CHECK_USER: public PARSER
{
diff --git a/stglibs/srvconf.lib/include/stg/parser_get_user.h b/stglibs/srvconf.lib/include/stg/parser_get_user.h
index db074af4..7b6032e0 100644
--- a/stglibs/srvconf.lib/include/stg/parser_get_user.h
+++ b/stglibs/srvconf.lib/include/stg/parser_get_user.h
@@ -22,7 +22,7 @@
#ifndef __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__
#define __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__
-#include "stg/parser.h"
+#include "parser.h"
#include "stg/os_int.h"
#include "stg/const.h"
diff --git a/stglibs/srvconf.lib/include/stg/parser_get_users.h b/stglibs/srvconf.lib/include/stg/parser_get_users.h
index b35aa48c..5338a913 100644
--- a/stglibs/srvconf.lib/include/stg/parser_get_users.h
+++ b/stglibs/srvconf.lib/include/stg/parser_get_users.h
@@ -23,7 +23,7 @@
#ifndef __STG_STGLIBS_SRVCONF_PARSER_GET_USERS_H__
#define __STG_STGLIBS_SRVCONF_PARSER_GET_USERS_H__
-#include "stg/parser.h"
+#include "parser.h"
#include "parser_get_user.h"
diff --git a/stglibs/srvconf.lib/include/stg/parser_server_info.h b/stglibs/srvconf.lib/include/stg/parser_server_info.h
index 38e87186..ce7a70ae 100644
--- a/stglibs/srvconf.lib/include/stg/parser_server_info.h
+++ b/stglibs/srvconf.lib/include/stg/parser_server_info.h
@@ -22,7 +22,7 @@
#ifndef __STG_STGLIBS_SRVCONF_PARSER_SERVER_INFO_H__
#define __STG_STGLIBS_SRVCONF_PARSER_SERVER_INFO_H__
-#include "stg/parser.h"
+#include "/parser.h"
#include "stg/const.h"
diff --git a/stglibs/srvconf.lib/include/stg/servconf.h b/stglibs/srvconf.lib/include/stg/servconf.h
index f455730e..fddbcf7a 100644
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -58,21 +58,6 @@ struct ADMINDATA
char login[ADM_LOGIN_LEN];
};
//-----------------------------------------------------------------------------
-class PARSER_CHG_USER: public PARSER
-{
-public:
- PARSER_CHG_USER();
- int ParseStart(const char *el, const char **attr);
- void ParseEnd(const char *el);
- void ParseAnswer(const char *el, const char **attr);
- void SetChgUserRecvCb(RecvChgUserCb_t, void * data);
-private:
- RecvChgUserCb_t RecvChgUserCb;
- void * chgUserCbData;
- int depth;
- bool error;
-};
-//-----------------------------------------------------------------------------
class PARSER_SEND_MESSAGE: public PARSER
{
public:
--
2.44.2