Move class VFormula to core folder.

--HG--
branch : feature

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)

src/app/container/container.pri

@@ -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

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

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 <QKeyEvent>

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 <QKeyEvent>

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,

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.

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");
 

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 <QtCore/qmath.h>
 

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");
 

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};
 

src/app/widgets/vformulapropertyeditor.h

@@ -35,7 +35,7 @@
 #include <QLabel>
 #include <QSpacerItem>
 
-#include "../container/vformula.h"
+#include "../core/vformula.h"
 
 class VFormulaPropertyEditor : public QWidget
 {

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 <QDockWidget>
 #include <QHBoxLayout>