diff --git a/src/app/app.pri b/src/app/app.pri index ba5f59840..7f5d8d065 100644 --- a/src/app/app.pri +++ b/src/app/app.pri @@ -1,5 +1,4 @@ # Suport subdirectories. Just better project code tree. -include(container/container.pri) include(dialogs/dialogs.pri) include(tools/tools.pri) include(widgets/widgets.pri) diff --git a/src/app/container/container.pri b/src/app/container/container.pri deleted file mode 100644 index 44e5c9e4e..000000000 --- a/src/app/container/container.pri +++ /dev/null @@ -1,8 +0,0 @@ -# ADD TO EACH PATH $$PWD VARIABLE!!!!!! -# This need for corect working file translations.pro - -SOURCES += \ - $$PWD/vformula.cpp - -HEADERS += \ - $$PWD/vformula.h diff --git a/src/app/core/core.pri b/src/app/core/core.pri index b4a9799f2..5b7e0e14d 100644 --- a/src/app/core/core.pri +++ b/src/app/core/core.pri @@ -6,11 +6,13 @@ HEADERS += \ $$PWD/undoevent.h \ $$PWD/vsettings.h \ $$PWD/backport/qcommandlineoption.h \ - $$PWD/backport/qcommandlineparser.h + $$PWD/backport/qcommandlineparser.h \ + $$PWD/vformula.h SOURCES += \ $$PWD/vapplication.cpp \ $$PWD/undoevent.cpp \ $$PWD/vsettings.cpp \ $$PWD/backport/qcommandlineoption.cpp \ - $$PWD/backport/qcommandlineparser.cpp + $$PWD/backport/qcommandlineparser.cpp \ + $$PWD/vformula.cpp diff --git a/src/app/container/vformula.cpp b/src/app/core/vformula.cpp similarity index 100% rename from src/app/container/vformula.cpp rename to src/app/core/vformula.cpp diff --git a/src/app/container/vformula.h b/src/app/core/vformula.h similarity index 100% rename from src/app/container/vformula.h rename to src/app/core/vformula.h diff --git a/src/app/tools/drawTools/vtoolarc.cpp b/src/app/tools/drawTools/vtoolarc.cpp index af0dfd106..b4c77d517 100644 --- a/src/app/tools/drawTools/vtoolarc.cpp +++ b/src/app/tools/drawTools/vtoolarc.cpp @@ -30,7 +30,7 @@ #include "../../libs/vpatterndb/calculator.h" #include "../../dialogs/tools/dialogarc.h" #include "../../libs/vgeometry/varc.h" -#include "../container/vformula.h" +#include "../core/vformula.h" #include "../../visualization/vistoolarc.h" #include diff --git a/src/app/tools/drawTools/vtoolarcwithlength.cpp b/src/app/tools/drawTools/vtoolarcwithlength.cpp index 34f53b611..af2a1ed3c 100644 --- a/src/app/tools/drawTools/vtoolarcwithlength.cpp +++ b/src/app/tools/drawTools/vtoolarcwithlength.cpp @@ -30,7 +30,7 @@ #include "../../libs/vpatterndb/calculator.h" #include "../../dialogs/tools/dialogarcwithlength.h" #include "../../libs/vgeometry/varc.h" -#include "../container/vformula.h" +#include "../core/vformula.h" #include "../../visualization/vistoolarcwithlength.h" #include diff --git a/src/app/tools/drawTools/vtoolcut.cpp b/src/app/tools/drawTools/vtoolcut.cpp index a688c68ac..746533674 100644 --- a/src/app/tools/drawTools/vtoolcut.cpp +++ b/src/app/tools/drawTools/vtoolcut.cpp @@ -28,7 +28,7 @@ #include "vtoolcut.h" #include "../../libs/vgeometry/vpointf.h" -#include "../../container/vformula.h" +#include "../../core/vformula.h" //--------------------------------------------------------------------------------------------------------------------- VToolCut::VToolCut(VPattern *doc, VContainer *data, const quint32 &id, const QString &formula, diff --git a/src/app/tools/drawTools/vtoollinepoint.h b/src/app/tools/drawTools/vtoollinepoint.h index e957d5679..6b840ce4b 100644 --- a/src/app/tools/drawTools/vtoollinepoint.h +++ b/src/app/tools/drawTools/vtoollinepoint.h @@ -30,7 +30,7 @@ #define VTOOLLINEPOINT_H #include "vtoolpoint.h" -#include "../container/vformula.h" +#include "../core/vformula.h" /** * @brief The VToolLinePoint class parent for all tools what create point with line. diff --git a/src/app/tools/drawTools/vtoolpointfromcircleandtangent.cpp b/src/app/tools/drawTools/vtoolpointfromcircleandtangent.cpp index 745b93d10..2a9b08f25 100644 --- a/src/app/tools/drawTools/vtoolpointfromcircleandtangent.cpp +++ b/src/app/tools/drawTools/vtoolpointfromcircleandtangent.cpp @@ -31,7 +31,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vgeometry/varc.h" #include "../../visualization/vistoolpointfromcircleandtangent.h" -#include "../container/vformula.h" +#include "../core/vformula.h" const QString VToolPointFromCircleAndTangent::ToolType = QStringLiteral("pointFromCircleAndTangent"); diff --git a/src/app/tools/drawTools/vtoolpointofcontact.cpp b/src/app/tools/drawTools/vtoolpointofcontact.cpp index 91e4d8781..026529f95 100644 --- a/src/app/tools/drawTools/vtoolpointofcontact.cpp +++ b/src/app/tools/drawTools/vtoolpointofcontact.cpp @@ -30,7 +30,7 @@ #include "../../libs/vpatterndb/calculator.h" #include "../../dialogs/tools/dialogpointofcontact.h" #include "../../libs/vgeometry/vpointf.h" -#include "../../container/vformula.h" +#include "../../core/vformula.h" #include "../../visualization/vistoolpointofcontact.h" #include diff --git a/src/app/tools/drawTools/vtoolpointofintersectioncircles.cpp b/src/app/tools/drawTools/vtoolpointofintersectioncircles.cpp index 9b5ce9f3b..f9adc78fa 100644 --- a/src/app/tools/drawTools/vtoolpointofintersectioncircles.cpp +++ b/src/app/tools/drawTools/vtoolpointofintersectioncircles.cpp @@ -31,7 +31,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vgeometry/varc.h" #include "../../visualization/vistoolpointofintersectioncircles.h" -#include "../container/vformula.h" +#include "../core/vformula.h" const QString VToolPointOfIntersectionCircles::ToolType = QStringLiteral("pointOfIntersectionCircles"); diff --git a/src/app/widgets/vformulaproperty.cpp b/src/app/widgets/vformulaproperty.cpp index c9f468e46..7ec0625eb 100644 --- a/src/app/widgets/vformulaproperty.cpp +++ b/src/app/widgets/vformulaproperty.cpp @@ -32,7 +32,7 @@ #include "../../libs/vpropertyexplorer/vproperty_p.h" #include "vformulapropertyeditor.h" #include "../../libs/vpropertyexplorer/vproperties.h" -#include "../container/vformula.h" +#include "../core/vformula.h" enum class ChildType : char {Invalid = 0, Value = 1, Formula = 2}; diff --git a/src/app/widgets/vformulapropertyeditor.h b/src/app/widgets/vformulapropertyeditor.h index e3d25b0c9..3d3c529aa 100644 --- a/src/app/widgets/vformulapropertyeditor.h +++ b/src/app/widgets/vformulapropertyeditor.h @@ -35,7 +35,7 @@ #include #include -#include "../container/vformula.h" +#include "../core/vformula.h" class VFormulaPropertyEditor : public QWidget { diff --git a/src/app/widgets/vtooloptionspropertybrowser.cpp b/src/app/widgets/vtooloptionspropertybrowser.cpp index 0f10f6a66..0ef4f58e9 100644 --- a/src/app/widgets/vtooloptionspropertybrowser.cpp +++ b/src/app/widgets/vtooloptionspropertybrowser.cpp @@ -34,7 +34,7 @@ #include "../visualization/vcontrolpointspline.h" #include "../../libs/vpropertyexplorer/vproperties.h" #include "vformulaproperty.h" -#include "../container/vformula.h" +#include "../core/vformula.h" #include #include