From: Maxim Mamontov <faust.madf@gmail.com>
Date: Fri, 20 Jun 2014 22:28:36 +0000 (+0300)
Subject: Cleaned up some headers.
X-Git-Tag: 2.409~297
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/4662fe21cd850eb2fecff20c9d93888b50f40245
Cleaned up some headers.
Conflicts:
projects/stargazer/plugins/configuration/sgconfig/parser_user_info.cpp
---
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 <unistd.h>
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 <stdio.h>
-#include <sys/utsname.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+/*
+ * 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 <stg34@stargazer.dp.ua>
+ */
-#include <cstring>
-#include <cerrno>
-#include <sstream>
+#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 <cstring>
+#include <cstdio> // sprintf
+
+#include <sys/utsname.h>
#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 <stg34@stargazer.dp.ua>
*/
#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 <string>
#include <vector>
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 <stdio.h>
-#include <string.h>
-
#include "parser.h"
+#include "stg/admins.h"
+#include "stg/common.h"
+
+#include <strings.h> // 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 <cstdio> // snprintf
-#include <cstring>
+#include "parser.h"
#include "stg/tariffs.h"
-#include "parser.h"
+#include "stg/users.h"
+#include "stg/common.h"
+
+#include <cstdio> // snprintf
+#include <cstring>
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 <stg34@stargazer.dp.ua>
-*
-* $Revision: 1.24 $
-* $Date: 2010/10/04 20:24:54 $
-*
-*******************************************************************/
+/*
+ * Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
+ */
#include "configproto.h"
#include "parser.h"
+#include "stg/admins.h"
#include "stg/logger.h"
#include "stg/common.h"
#include "stg/blowfish.h"