Cleaned up some headers.

diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
index 7f46fab22d806406ee660769f5802cd3bd6c2ca8..a5ffcf5b3c5d4a4828d26245cd3e117c6c5a1be6 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -38,6 +38,7 @@
 #include "stg/admins.h"
 #include "stg/tariffs.h"
 #include "stg/logger.h"
 #include "stg/admins.h"
 #include "stg/tariffs.h"
 #include "stg/logger.h"

+#include "stg/common.h"

 
 #include <unistd.h>
 
 
 #include <unistd.h>
 

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
index 017b78b096a2b940e61beadd7fa7792476ba7433..45ef82c8a4ee566d1605458d102b228181a729d0 100644 (file)
--- 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/tariffs.h"

+#include "stg/admin.h"
+#include "stg/users.h"

 #include "stg/user_property.h"
 #include "stg/settings.h"
 #include "stg/logger.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)
 
 
 #define  UNAME_LEN      (256)
 

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h
index b991a807b95fa87c1d5bfbc2129f16b1553c7698..81bd454b92067814713060dd58293d6fb2393e9c 100644 (file)
--- 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
 
  */
 
 #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/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;
 
 #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 {
 
 //-----------------------------------------------------------------------------
 class BASE_PARSER {

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp
index 7783888e37d24e632c4771bb2645a98ca00328c1..fef2efbad3434cd7a7411c38663b7766d1fcf631 100644 (file)
--- 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 "parser.h"
 

+#include "stg/admins.h"
+#include "stg/common.h"
+
+#include <strings.h> // strcasecmp
+

 //-----------------------------------------------------------------------------
 //  GET ADMINS
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  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 1ac27d6500c3208e91f8eb87f591e3f0043a5119..21765e11c1a9b18dcf10181797145bd69c8e2eee 100644 (file)
--- 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 "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)
 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 88ab267082e76aa83a0decf9c793f281fcf2d937..e083f85292b0ea60929bbdf54be2d948b6b8ee4a 100644 (file)
--- 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 "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;
 //-----------------------------------------------------------------------------
 
 const int pt_mega = 1024 * 1024;
 //-----------------------------------------------------------------------------

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.cpp
index 0e06a4a7ac12d9d41159933344f65c4202c5813c..de28eaba925b1b15ef8054a5d1bc0b170a001666 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.cpp
@@ -20,6 +20,7 @@
 
 #include "parser_user_info.h"
 
 
 #include "parser_user_info.h"
 

+#include "stg/users.h"

 #include "stg/user.h"
 #include "stg/common.h"
 
 #include "stg/user.h"
 #include "stg/common.h"
 

diff --git a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
index e9f50e4802f65f4b62270024d7ddcbfefeabb45f..15403e8b79bb8730970b79508128444349ffafa6 100644 (file)
--- 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
  */
 
  *    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 "configproto.h"
 
 #include "parser.h"
 

+#include "stg/admins.h"

 #include "stg/logger.h"
 #include "stg/common.h"
 #include "stg/blowfish.h"
 #include "stg/logger.h"
 #include "stg/common.h"
 #include "stg/blowfish.h"