From cabe2c96b204b7b0cafcb57290f7592e0c040570 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Thu, 7 Apr 2011 18:46:17 +0300 Subject: [PATCH] Fix convertor compilation errors --- projects/convertor/main.cpp | 25 +++++++++++++------------ projects/convertor/settings_impl.cpp | 7 ++++--- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/projects/convertor/main.cpp b/projects/convertor/main.cpp index 9308ed36..f6491c7b 100644 --- a/projects/convertor/main.cpp +++ b/projects/convertor/main.cpp @@ -32,19 +32,20 @@ #include #include -#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 "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; diff --git a/projects/convertor/settings_impl.cpp b/projects/convertor/settings_impl.cpp index 44206340..645865cb 100644 --- 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 $ */ -#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 "common.h" int SETTINGS_IMPL::ParseModuleSettings(const DOTCONFDocumentNode * node, std::vector * params) { -- 2.44.2