Merge branch 'log-unauth-reasons' into full-month-stats

[stg.git] / projects / stargazer / plugins / configuration / sgconfig2 / configproto.h

diff --git a/projects/stargazer/plugins/configuration/sgconfig2/configproto.h b/projects/stargazer/plugins/configuration/sgconfig2/configproto.h
index 71e546b427205634809f3c197f137db618a55238..5aea5499845369744a5b22e721da47cec8e19e65 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig2/configproto.h
+++ b/projects/stargazer/plugins/configuration/sgconfig2/configproto.h
@@ -36,10 +36,10 @@
 #include <string>
 
 #include "parser.h"
-#include "../../../users.h"
-#include "../../../admins.h"
-#include "../../../tariffs.h"
-#include "stg_logger.h"
+#include "users.h"
+#include "admins.h"
+#include "tariffs.h"
+#include "logger.h"
 
 using namespace std;
 
@@ -63,7 +63,7 @@ public:
     void            SetAdmins(ADMINS * a);
     void            SetUsers(USERS * u);
     void            SetTariffs(TARIFFS * t);
-    void            SetStore(BASE_STORE * s);
+    void            SetStore(STORE * s);
     void            SetStgSettings(const SETTINGS * s);
     const string &  GetAdminLogin();
     uint32_t        GetAdminIP();
@@ -126,7 +126,7 @@ private:
     ADMINS *                    admins;
     USERS *                     users;
     TARIFFS *                   tariffs;
-    BASE_STORE *                store;
+    STORE *                     store;
     const SETTINGS *            settings;
 
     BASE_PARSER *               currParser;
@@ -141,4 +141,3 @@ private:
 };
 //-----------------------------------------------------------------------------
 #endif //CONFIGPROTO_H
-