diff --git a/src/app/xml/vpattern.h b/src/app/xml/vpattern.h index d0afc0219..9dc53bdff 100644 --- a/src/app/xml/vpattern.h +++ b/src/app/xml/vpattern.h @@ -30,7 +30,7 @@ #define VPATTERN_H #include "../libs/ifc/xml/vdomdocument.h" -#include "vtoolrecord.h" +#include "../libs/ifc/xml/vtoolrecord.h" #include "../libs/vpatterndb/vcontainer.h" class VDataTool; diff --git a/src/app/xml/xml.pri b/src/app/xml/xml.pri index a26d7d4aa..83491ded1 100644 --- a/src/app/xml/xml.pri +++ b/src/app/xml/xml.pri @@ -2,14 +2,12 @@ # This need for corect working file translations.pro HEADERS += \ - $$PWD/vtoolrecord.h \ $$PWD/vpattern.h \ $$PWD/vstandardmeasurements.h \ $$PWD/vindividualmeasurements.h \ $$PWD/vabstractmeasurements.h SOURCES += \ - $$PWD/vtoolrecord.cpp \ $$PWD/vpattern.cpp \ $$PWD/vstandardmeasurements.cpp \ $$PWD/vindividualmeasurements.cpp \ diff --git a/src/libs/ifc/ifc.pri b/src/libs/ifc/ifc.pri index b95b3e813..e999dd096 100644 --- a/src/libs/ifc/ifc.pri +++ b/src/libs/ifc/ifc.pri @@ -11,4 +11,4 @@ HEADERS += \ SOURCES += \ $$PWD/stable.cpp \ - ifcdef.cpp + $$PWD/ifcdef.cpp diff --git a/src/app/xml/vtoolrecord.cpp b/src/libs/ifc/xml/vtoolrecord.cpp similarity index 99% rename from src/app/xml/vtoolrecord.cpp rename to src/libs/ifc/xml/vtoolrecord.cpp index 12bbc3660..4202c1f6e 100644 --- a/src/app/xml/vtoolrecord.cpp +++ b/src/libs/ifc/xml/vtoolrecord.cpp @@ -27,6 +27,7 @@ *************************************************************************/ #include "vtoolrecord.h" +#include "../ifcdef.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/xml/vtoolrecord.h b/src/libs/ifc/xml/vtoolrecord.h similarity index 99% rename from src/app/xml/vtoolrecord.h rename to src/libs/ifc/xml/vtoolrecord.h index 836f0a779..dd927a999 100644 --- a/src/app/xml/vtoolrecord.h +++ b/src/libs/ifc/xml/vtoolrecord.h @@ -29,7 +29,7 @@ #ifndef VTOOLRECORD_H #define VTOOLRECORD_H -#include "../options.h" +#include "../../utils/def.h" #include diff --git a/src/libs/ifc/xml/xml.pri b/src/libs/ifc/xml/xml.pri index c64e090e9..81fd98886 100644 --- a/src/libs/ifc/xml/xml.pri +++ b/src/libs/ifc/xml/xml.pri @@ -4,9 +4,11 @@ HEADERS += \ $$PWD/vabstractconverter.h \ $$PWD/vdomdocument.h \ - $$PWD/vpatternconverter.h + $$PWD/vpatternconverter.h \ + $$PWD/vtoolrecord.h SOURCES += \ $$PWD/vabstractconverter.cpp \ $$PWD/vdomdocument.cpp \ - $$PWD/vpatternconverter.cpp + $$PWD/vpatternconverter.cpp \ + $$PWD/vtoolrecord.cpp