Fix firebird store plugin compilation errors

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store.cpp b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
index 64306acf9d5957878864ce23190e21a74e2a807c..f8de335702593a2460e64ad133c8d78d1fd00b1b 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.cpp
@@ -33,7 +33,7 @@
 using namespace std;
 
 #include "firebird_store.h"
 using namespace std;
 
 #include "firebird_store.h"

-#include "ibpp.h"
+#include "stg/ibpp.h"

 
 class FIREBIRD_STORE_CREATOR
 {
 
 class FIREBIRD_STORE_CREATOR
 {

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store.h b/projects/stargazer/plugins/store/firebird/firebird_store.h
index 45cf4f8dd3444bcf4fd0cac883b8351e387dabf3..2bd094bd3bf043859c655ccb2538a8b7a646d551 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store.h
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.h
@@ -34,9 +34,9 @@
 #include <vector>
 #include <map>
 
 #include <vector>
 #include <map>
 

-#include "store.h"
-#include "stg_locker.h"
-#include "ibpp.h"
+#include "stg/store.h"
+#include "stg/stg_locker.h"
+#include "stg/ibpp.h"

 
 struct ToLower {
     char operator() (char c) const  { return std::tolower(c); }
 
 struct ToLower {
     char operator() (char c) const  { return std::tolower(c); }

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_admins.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_admins.cpp
index 98383482f28072fd0a9c91a65ed0ded2d0835d25..25a2bf51af59b9f919b76a90e80e8d8c74605f4c 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store_admins.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_admins.cpp
@@ -32,8 +32,8 @@
 using namespace std;
 
 #include "firebird_store.h"
 using namespace std;
 
 #include "firebird_store.h"

-#include "ibpp.h"
-#include "blowfish.h"
+#include "stg/ibpp.h"
+#include "stg/blowfish.h"

 
 #define adm_enc_passwd "cjeifY8m3"
 
 
 #define adm_enc_passwd "cjeifY8m3"
 

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_corporations.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_corporations.cpp
index 71e75cbefc9c8936da2425446fbca53c44c20197..026fef924b4e3e1d3b8ebd8903e3b8e067115861 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store_corporations.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_corporations.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "firebird_store.h"
  */
 
 #include "firebird_store.h"

-#include "ibpp.h"
+#include "stg/ibpp.h"

 
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::GetCorpsList(vector<string> * corpsList) const
 
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::GetCorpsList(vector<string> * corpsList) const

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_messages.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_messages.cpp
index 53805eb0187ea41851cd99413a800966ae092c85..c6180c2608ff4f024b9c1e7a9c069bf6dc905ea0 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store_messages.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_messages.cpp
@@ -30,7 +30,7 @@
 #include <sstream>
 
 #include "firebird_store.h"
 #include <sstream>
 
 #include "firebird_store.h"

-#include "ibpp.h"
+#include "stg/ibpp.h"

 
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::AddMessage(STG_MSG * msg, const string & login) const
 
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::AddMessage(STG_MSG * msg, const string & login) const

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_services.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_services.cpp
index 01a460e706a5114c99968cc2933b1eb1d0038201..7d7b3d53305989c66c047ab5ae64553775be1187 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store_services.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_services.cpp
@@ -28,7 +28,7 @@
  */
 
 #include "firebird_store.h"
  */
 
 #include "firebird_store.h"

-#include "ibpp.h"
+#include "stg/ibpp.h"

 
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::GetServicesList(vector<string> * servicesList) const
 
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::GetServicesList(vector<string> * servicesList) const

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
index eaba5b53fce85074da5027990cb96c059e4ccb91..8967d6eaa55d4fcc57956e8a011bac2c7508a9b4 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "firebird_store.h"
  */
 
 #include "firebird_store.h"

-#include "ibpp.h"
+#include "stg/ibpp.h"

 
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::GetTariffsList(vector<string> * tariffsList) const
 
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::GetTariffsList(vector<string> * tariffsList) const

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_users.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_users.cpp
index 6d2d36bf4cd2bda5692e1b78f9d184c5919878a2..5e959abde550259e61f9a2b69826feaff693d0c1 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store_users.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_users.cpp
@@ -26,9 +26,9 @@
  *
  */
 
  *
  */
 

-#include "stg_const.h"
+#include "stg/stg_const.h"

 #include "firebird_store.h"
 #include "firebird_store.h"

-#include "ibpp.h"
+#include "stg/ibpp.h"

 
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::GetUsersList(vector<string> * usersList) const
 
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::GetUsersList(vector<string> * usersList) const

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_utils.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_utils.cpp
index 17ab0d402f44b7c3d26e662fda195ffa63962de2..22feadf0aba9414c288e5ee589d3c3608e417b98 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store_utils.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_utils.cpp
@@ -29,7 +29,7 @@
 #include <cstdio>
 
 #include "firebird_store.h"
 #include <cstdio>
 
 #include "firebird_store.h"

-#include "ibpp.h"
+#include "stg/ibpp.h"

 
 //-----------------------------------------------------------------------------
 time_t ts2time_t(const IBPP::Timestamp & ts) const
 
 //-----------------------------------------------------------------------------
 time_t ts2time_t(const IBPP::Timestamp & ts) const