From 03f1c4e01b98531d28f040e47974750537b05c2f Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust@gts.dp.ua>
Date: Thu, 7 Apr 2011 18:37:47 +0300
Subject: [PATCH] Fix sgconfig plugin compilation errors

---
 .../plugins/configuration/sgconfig/configproto.h   |  8 ++++----
 .../plugins/configuration/sgconfig/parser.cpp      |  8 ++++----
 .../plugins/configuration/sgconfig/parser.h        | 14 +++++++-------
 .../configuration/sgconfig/parser_tariff.cpp       |  2 +-
 .../plugins/configuration/sgconfig/rsconf.cpp      |  2 +-
 .../plugins/configuration/sgconfig/stgconfig.cpp   |  6 +++---
 .../plugins/configuration/sgconfig/stgconfig.h     |  4 ++--
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.h b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
index 06748da8..8c5aa3c5 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
@@ -35,11 +35,11 @@
 #include <string>
 #include <list>
 
+#include "stg/users.h"
+#include "stg/admins.h"
+#include "stg/tariffs.h"
+#include "stg/stg_logger.h"
 #include "parser.h"
-#include "users.h"
-#include "admins.h"
-#include "tariffs.h"
-#include "stg_logger.h"
 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"
diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
index 042df803..30252544 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
@@ -9,11 +9,11 @@
 #include <cerrno>
 #include <sstream>
 
+#include "stg/version.h"
+#include "stg/tariffs.h"
+#include "stg/user_property.h"
+#include "stg/settings.h"
 #include "parser.h"
-#include "version.h"
-#include "tariffs.h"
-#include "user_property.h"
-#include "settings.h"
 
 #define  UNAME_LEN      (256)
 //-----------------------------------------------------------------------------
diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h
index 511a073e..af85b710 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.h
@@ -11,13 +11,13 @@
 #include <string>
 #include <vector>
 
-#include "resetable.h"
-#include "stg_const.h"
-#include "store.h"
-#include "admins.h"
-#include "admin.h"
-#include "users.h"
-#include "stg_message.h"
+#include "stg/resetable.h"
+#include "stg/stg_const.h"
+#include "stg/store.h"
+#include "stg/admins.h"
+#include "stg/admin.h"
+#include "stg/users.h"
+#include "stg/stg_message.h"
 
 class TARIFFS;
 class SETTINGS;
diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
index 389e8575..9bac0294 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
@@ -1,8 +1,8 @@
 #include <cstdio> // snprintf
 #include <cstring>
 
+#include "stg/tariffs.h"
 #include "parser.h"
-#include "tariffs.h"
 
 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 98128832..479a1357 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
@@ -32,8 +32,8 @@
 #include <csignal>
 #include <cstdio> // snprintf
 
+#include "stg/blowfish.h"
 #include "configproto.h"
-#include "blowfish.h"
 
 #ifndef ENODATA
 // FreeBSD 4.* - suxx
diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
index baf7cbee..9ffbc949 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
@@ -4,10 +4,10 @@
 
 #include <algorithm>
 
+#include "stg/tariffs.h"
+#include "stg/admins.h"
+#include "stg/users.h"
 #include "stgconfig.h"
-#include "tariffs.h"
-#include "admins.h"
-#include "users.h"
 
 class STGCONFIG_CREATOR
 {
diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
index 83ffa59b..7d490aef 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
@@ -5,8 +5,8 @@
 
 #include <string>
 
-#include "plugin.h"
-#include "store.h"
+#include "stg/plugin.h"
+#include "stg/store.h"
 #include "configproto.h"
 
 extern "C" PLUGIN * GetPlugin();
-- 
2.44.2