Fix convertor compilation errors

diff --git a/projects/convertor/main.cpp b/projects/convertor/main.cpp
index 9308ed3660713183ac5d1da23f88c126cff197bb..f6491c7bca0c38c035e30f0ed056df261b95e1ac 100644 (file)
--- a/projects/convertor/main.cpp
+++ b/projects/convertor/main.cpp
@@ -32,19 +32,20 @@
 #include <ctime>
 #include <algorithm>
 
 #include <ctime>
 #include <algorithm>
 

-#include "common.h"
-#include "store.h"
+#include "stg/common.h"
+#include "stg/store.h"
+#include "stg/conffiles.h"
+
+#include "stg/user_stat.h"
+#include "stg/user_conf.h"
+#include "stg/corp_conf.h"
+#include "stg/service_conf.h"
+#include "stg/admin_conf.h"
+#include "stg/tariff_conf.h"
+#include "stg/settings.h"
+#include "stg/stg_message.h"
+

 #include "settings_impl.h"
 #include "settings_impl.h"

-#include "conffiles.h"
-
-#include "user_stat.h"
-#include "user_conf.h"
-#include "corp_conf.h"
-#include "service_conf.h"
-#include "admin_conf.h"
-#include "tariff_conf.h"
-#include "settings.h"
-#include "stg_message.h"

 
 using namespace std;
 
 
 using namespace std;
 

diff --git a/projects/convertor/settings_impl.cpp b/projects/convertor/settings_impl.cpp
index 4420634081d5486c09ef0dc7cd53b86e466d7b2e..645865cb9c91613ba899ca5761ec3909be701776 100644 (file)
--- a/projects/convertor/settings_impl.cpp
+++ b/projects/convertor/settings_impl.cpp
@@ -27,10 +27,11 @@ $Revision: 1.6 $
 $Date: 2009/06/22 16:26:54 $
 */
 
 $Date: 2009/06/22 16:26:54 $
 */
 

-#include "dotconfpp.h"
-#include "module_settings.h"
+#include "stg/dotconfpp.h"
+#include "stg/module_settings.h"
+#include "stg/common.h"
+

 #include "settings_impl.h"
 #include "settings_impl.h"

-#include "common.h"

 
 int SETTINGS_IMPL::ParseModuleSettings(const DOTCONFDocumentNode * node, std::vector<PARAM_VALUE> * params)
 {
 
 int SETTINGS_IMPL::ParseModuleSettings(const DOTCONFDocumentNode * node, std::vector<PARAM_VALUE> * params)
 {