From: Maxim Mamontov Date: Thu, 7 Apr 2011 15:35:46 +0000 (+0300) Subject: Fix firebird store plugin compilation errors X-Git-Tag: 2.407-rc3~47 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/bd66b226090397493de8d87649b2bbad3ac89e36?ds=sidebyside 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 64306acf..f8de3357 100644 --- 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" -#include "ibpp.h" +#include "stg/ibpp.h" 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 45cf4f8d..2bd094bd 100644 --- a/projects/stargazer/plugins/store/firebird/firebird_store.h +++ b/projects/stargazer/plugins/store/firebird/firebird_store.h @@ -34,9 +34,9 @@ #include #include -#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); } diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_admins.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_admins.cpp index 98383482..25a2bf51 100644 --- 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" -#include "ibpp.h" -#include "blowfish.h" +#include "stg/ibpp.h" +#include "stg/blowfish.h" #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 71e75cbe..026fef92 100644 --- 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 "ibpp.h" +#include "stg/ibpp.h" //----------------------------------------------------------------------------- int FIREBIRD_STORE::GetCorpsList(vector * 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 53805eb0..c6180c26 100644 --- 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 #include "firebird_store.h" -#include "ibpp.h" +#include "stg/ibpp.h" //----------------------------------------------------------------------------- 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 01a460e7..7d7b3d53 100644 --- 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 "ibpp.h" +#include "stg/ibpp.h" //----------------------------------------------------------------------------- int FIREBIRD_STORE::GetServicesList(vector * 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 eaba5b53..8967d6ea 100644 --- 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 "ibpp.h" +#include "stg/ibpp.h" //----------------------------------------------------------------------------- int FIREBIRD_STORE::GetTariffsList(vector * 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 6d2d36bf..5e959abd 100644 --- 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 "ibpp.h" +#include "stg/ibpp.h" //----------------------------------------------------------------------------- int FIREBIRD_STORE::GetUsersList(vector * 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 17ab0d40..22feadf0 100644 --- 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 #include "firebird_store.h" -#include "ibpp.h" +#include "stg/ibpp.h" //----------------------------------------------------------------------------- time_t ts2time_t(const IBPP::Timestamp & ts) const