From 4662fe21cd850eb2fecff20c9d93888b50f40245 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Sat, 21 Jun 2014 01:28:36 +0300 Subject: [PATCH] Cleaned up some headers. Conflicts: projects/stargazer/plugins/configuration/sgconfig/parser_user_info.cpp --- .../configuration/sgconfig/configproto.cpp | 1 + .../plugins/configuration/sgconfig/parser.cpp | 40 ++++++++++++++----- .../plugins/configuration/sgconfig/parser.h | 36 ++++++++++++----- .../configuration/sgconfig/parser_admin.cpp | 8 ++-- .../configuration/sgconfig/parser_auth_by.cpp | 3 ++ .../configuration/sgconfig/parser_tariff.cpp | 9 +++-- .../plugins/configuration/sgconfig/rsconf.cpp | 15 ++----- 7 files changed, 75 insertions(+), 37 deletions(-) diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp index 7ece6549..162f0875 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp @@ -37,6 +37,7 @@ #include "stg/admins.h" #include "stg/tariffs.h" #include "stg/logger.h" +#include "stg/common.h" #include diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp index 360d07c7..dd654a1e 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp @@ -1,20 +1,38 @@ -#include -#include -#include -#include -#include -#include +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * Author : Boris Mikhailenko + */ -#include -#include -#include +#include "parser.h" -#include "stg/version.h" #include "stg/tariffs.h" +#include "stg/admin.h" +#include "stg/users.h" #include "stg/user_property.h" #include "stg/settings.h" #include "stg/logger.h" -#include "parser.h" +#include "stg/version.h" +#include "stg/store.h" + +#include +#include // sprintf + +#include #define UNAME_LEN (256) diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h index f854a759..24200ebd 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.h +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.h @@ -1,25 +1,43 @@ - /* - $Revision: 1.20 $ - $Date: 2010/10/04 20:26:10 $ - $Author: faust $ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * Author : Boris Mikhailenko */ #ifndef PARSER_H #define PARSER_H +#include "stg/message.h" +#include "stg/tariff_conf.h" #include "stg/resetable.h" #include "stg/const.h" -#include "stg/store.h" -#include "stg/admins.h" -#include "stg/admin.h" -#include "stg/users.h" -#include "stg/message.h" #include #include class TARIFFS; class SETTINGS; +class STORE; +class ADMINS; +class ADMIN; +class USERS; +class USER; +class USER_STAT_RES; +class USER_CONF_RES; //----------------------------------------------------------------------------- class BASE_PARSER { diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp index 7783888e..fef2efba 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp @@ -1,8 +1,10 @@ -#include -#include - #include "parser.h" +#include "stg/admins.h" +#include "stg/common.h" + +#include // strcasecmp + //----------------------------------------------------------------------------- // GET ADMINS //----------------------------------------------------------------------------- diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_auth_by.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_auth_by.cpp index 1ac27d65..21765e11 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_auth_by.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_auth_by.cpp @@ -1,5 +1,8 @@ #include "parser_auth_by.h" +#include "stg/users.h" +#include "stg/user.h" + int PARSER_AUTH_BY::ParseStart(void * /*data*/, const char *el, const char **attr) { if (strcasecmp(el, "GetUserAuthBy") == 0) diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp index 88ab2670..e083f852 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp @@ -1,8 +1,11 @@ -#include // snprintf -#include +#include "parser.h" #include "stg/tariffs.h" -#include "parser.h" +#include "stg/users.h" +#include "stg/common.h" + +#include // snprintf +#include const int pt_mega = 1024 * 1024; //----------------------------------------------------------------------------- diff --git a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp index 9488d71d..0986b701 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp @@ -14,22 +14,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/******************************************************************* -* -* DESCRIPTION: æÁÊÌ Ó ÏÓÎÏ×ÎÙÍÉ ÆÕÎËÃÉÑÍÉ ÄÌÑ ÓÅÔÅ×ÏÇÏ ÏÂÍÅÎÁ ÄÁÎÎÙÍÉ -* Ó ÍÅÎÅÄÖÅÒÏÍ ËÌÉÅÎÔÏ×. ðÒÉÅÍ, ÐÅÒÅÄÁÞÁ É ÛÉÆÒÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ. -* -* AUTHOR: Boris Mikhailenko -* -* $Revision: 1.24 $ -* $Date: 2010/10/04 20:24:54 $ -* -*******************************************************************/ +/* + * Author : Boris Mikhailenko + */ #include "configproto.h" #include "parser.h" +#include "stg/admins.h" #include "stg/logger.h" #include "stg/common.h" #include "stg/blowfish.h" -- 2.44.2