diff --git a/src/app/app.pri b/src/app/app.pri index 7f5d8d065..807bc2eae 100644 --- a/src/app/app.pri +++ b/src/app/app.pri @@ -1,7 +1,6 @@ # Suport subdirectories. Just better project code tree. include(dialogs/dialogs.pri) include(tools/tools.pri) -include(widgets/widgets.pri) include(xml/xml.pri) include(undocommands/undocommands.pri) include(visualization/visualization.pri) diff --git a/src/app/core/core.pri b/src/app/core/core.pri index e977232d8..ffccc7e44 100644 --- a/src/app/core/core.pri +++ b/src/app/core/core.pri @@ -4,9 +4,15 @@ HEADERS += \ $$PWD/vapplication.h \ $$PWD/vsettings.h \ - $$PWD/vformula.h + $$PWD/vformula.h \ + $$PWD/vformulaproperty.h \ + $$PWD/vformulapropertyeditor.h \ + $$PWD/vtooloptionspropertybrowser.h SOURCES += \ $$PWD/vapplication.cpp \ $$PWD/vsettings.cpp \ - $$PWD/vformula.cpp + $$PWD/vformula.cpp \ + $$PWD/vformulaproperty.cpp \ + $$PWD/vformulapropertyeditor.cpp \ + $$PWD/vtooloptionspropertybrowser.cpp diff --git a/src/app/widgets/vformulaproperty.cpp b/src/app/core/vformulaproperty.cpp similarity index 100% rename from src/app/widgets/vformulaproperty.cpp rename to src/app/core/vformulaproperty.cpp diff --git a/src/app/widgets/vformulaproperty.h b/src/app/core/vformulaproperty.h similarity index 100% rename from src/app/widgets/vformulaproperty.h rename to src/app/core/vformulaproperty.h diff --git a/src/app/widgets/vformulapropertyeditor.cpp b/src/app/core/vformulapropertyeditor.cpp similarity index 100% rename from src/app/widgets/vformulapropertyeditor.cpp rename to src/app/core/vformulapropertyeditor.cpp diff --git a/src/app/widgets/vformulapropertyeditor.h b/src/app/core/vformulapropertyeditor.h similarity index 100% rename from src/app/widgets/vformulapropertyeditor.h rename to src/app/core/vformulapropertyeditor.h diff --git a/src/app/widgets/vtooloptionspropertybrowser.cpp b/src/app/core/vtooloptionspropertybrowser.cpp similarity index 100% rename from src/app/widgets/vtooloptionspropertybrowser.cpp rename to src/app/core/vtooloptionspropertybrowser.cpp diff --git a/src/app/widgets/vtooloptionspropertybrowser.h b/src/app/core/vtooloptionspropertybrowser.h similarity index 100% rename from src/app/widgets/vtooloptionspropertybrowser.h rename to src/app/core/vtooloptionspropertybrowser.h diff --git a/src/app/dialogs/app/configdialog.cpp b/src/app/dialogs/app/configdialog.cpp index e36471a83..fe3d0bc87 100644 --- a/src/app/dialogs/app/configdialog.cpp +++ b/src/app/dialogs/app/configdialog.cpp @@ -33,7 +33,7 @@ #include #include #include -#include "../core/vapplication.h" +#include "../../core/vapplication.h" //--------------------------------------------------------------------------------------------------------------------- ConfigDialog::ConfigDialog(QWidget *parent) : diff --git a/src/app/dialogs/app/dialogaboutapp.cpp b/src/app/dialogs/app/dialogaboutapp.cpp index 17dce5b12..c27706168 100644 --- a/src/app/dialogs/app/dialogaboutapp.cpp +++ b/src/app/dialogs/app/dialogaboutapp.cpp @@ -33,7 +33,7 @@ #include #include #include "../../options.h" -#include "../core/vapplication.h" +#include "../../core/vapplication.h" //--------------------------------------------------------------------------------------------------------------------- DialogAboutApp::DialogAboutApp(QWidget *parent) : diff --git a/src/app/dialogs/app/dialoglayoutprogress.cpp b/src/app/dialogs/app/dialoglayoutprogress.cpp index f15268cfe..ed326f51d 100644 --- a/src/app/dialogs/app/dialoglayoutprogress.cpp +++ b/src/app/dialogs/app/dialoglayoutprogress.cpp @@ -28,8 +28,8 @@ #include "dialoglayoutprogress.h" #include "ui_dialoglayoutprogress.h" -#include "../options.h" -#include "../core/vapplication.h" +#include "../../options.h" +#include "../../core/vapplication.h" #include #include diff --git a/src/app/dialogs/app/dialogmeasurements.cpp b/src/app/dialogs/app/dialogmeasurements.cpp index cfa386f55..c9d49c8fa 100644 --- a/src/app/dialogs/app/dialogmeasurements.cpp +++ b/src/app/dialogs/app/dialogmeasurements.cpp @@ -28,7 +28,7 @@ #include "dialogmeasurements.h" #include "ui_dialogmeasurements.h" -#include "../core/vapplication.h" +#include "../../core/vapplication.h" //--------------------------------------------------------------------------------------------------------------------- DialogMeasurements::DialogMeasurements(QWidget *parent) : diff --git a/src/app/dialogs/app/dialogpatternxmledit.cpp b/src/app/dialogs/app/dialogpatternxmledit.cpp index b1782f23f..55c45f6fe 100644 --- a/src/app/dialogs/app/dialogpatternxmledit.cpp +++ b/src/app/dialogs/app/dialogpatternxmledit.cpp @@ -28,7 +28,7 @@ #include "dialogpatternxmledit.h" #include "ui_dialogpatternxmledit.h" -#include "../core/vapplication.h" +#include "../../core/vapplication.h" #include #include diff --git a/src/app/dialogs/app/dialogsavelayout.cpp b/src/app/dialogs/app/dialogsavelayout.cpp index 3a37bba72..a26a7e1d2 100644 --- a/src/app/dialogs/app/dialogsavelayout.cpp +++ b/src/app/dialogs/app/dialogsavelayout.cpp @@ -28,7 +28,7 @@ #include "dialogsavelayout.h" #include "ui_dialogsavelayout.h" -#include "../options.h" +#include "../../options.h" #include "../../core/vapplication.h" #include "../../core/vsettings.h" diff --git a/src/app/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp index 145866c32..54f3ef57a 100644 --- a/src/app/dialogs/tools/dialogheight.cpp +++ b/src/app/dialogs/tools/dialogheight.cpp @@ -32,7 +32,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../tools/vabstracttool.h" -#include "../visualization/vistoolheight.h" +#include "../../visualization/vistoolheight.h" #include "../../libs/vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index c67f1f673..8285bd333 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -28,7 +28,7 @@ #include "dialognormal.h" #include "ui_dialognormal.h" -#include "../visualization/vistoolnormal.h" +#include "../../visualization/vistoolnormal.h" #include "../../../libs/vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" #include "dialogeditwrongformula.h" diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 1d04256f7..201e1a3f0 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -41,7 +41,7 @@ #include "../libs/vmisc/undoevent.h" #include "core/vsettings.h" #include "undocommands/renamepp.h" -#include "vtooloptionspropertybrowser.h" +#include "core/vtooloptionspropertybrowser.h" #include "options.h" #include "../libs/ifc/xml/vpatternconverter.h" #include "../vmisc/logging.h" diff --git a/src/app/mainwindowsnogui.cpp b/src/app/mainwindowsnogui.cpp index 55b3f5721..8ab38c3c4 100644 --- a/src/app/mainwindowsnogui.cpp +++ b/src/app/mainwindowsnogui.cpp @@ -27,13 +27,13 @@ *************************************************************************/ #include "mainwindowsnogui.h" -#include "../core/vapplication.h" +#include "core/vapplication.h" #include "../libs/vpatterndb/vcontainer.h" #include "../libs/vobj/vobjpaintdevice.h" -#include "../dialogs/app/dialoglayoutsettings.h" +#include "dialogs/app/dialoglayoutsettings.h" #include "../libs/vlayout/vlayoutgenerator.h" -#include "../dialogs/app/dialoglayoutprogress.h" -#include "../dialogs/app/dialogsavelayout.h" +#include "dialogs/app/dialoglayoutprogress.h" +#include "dialogs/app/dialogsavelayout.h" #include "../libs/vlayout/vposter.h" #include diff --git a/src/app/tools/drawTools/vdrawtool.cpp b/src/app/tools/drawTools/vdrawtool.cpp index 8f6980310..eeabe8c91 100644 --- a/src/app/tools/drawTools/vdrawtool.cpp +++ b/src/app/tools/drawTools/vdrawtool.cpp @@ -29,8 +29,8 @@ #include "vdrawtool.h" #include -#include "../dialogs/tools/dialogeditwrongformula.h" -#include "../dialogs/app/dialogundo.h" +#include "../../dialogs/tools/dialogeditwrongformula.h" +#include "../../dialogs/app/dialogundo.h" #include "../libs/vpatterndb/calculator.h" #include "../../undocommands/addtocalc.h" #include "../../undocommands/savetooloptions.h" diff --git a/src/app/tools/drawTools/vtoolarc.cpp b/src/app/tools/drawTools/vtoolarc.cpp index 3bcc3c0ab..5c98e36ef 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 "../core/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 17e03582f..ae65670b5 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 "../core/vformula.h" +#include "../../core/vformula.h" #include "../../visualization/vistoolarcwithlength.h" #include diff --git a/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp b/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp index b335d2fc8..2520c1e1b 100644 --- a/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp +++ b/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp @@ -32,7 +32,7 @@ #include "../../dialogs/tools/dialogcurveintersectaxis.h" #include "../../dialogs/tools/dialogeditwrongformula.h" #include "../../libs/vgeometry/vpointf.h" -#include "./../visualization/vistoolcurveintersectaxis.h" +#include "../../visualization/vistoolcurveintersectaxis.h" const QString VToolCurveIntersectAxis::ToolType = QStringLiteral("curveIntersectAxis"); diff --git a/src/app/tools/drawTools/vtoolendline.cpp b/src/app/tools/drawTools/vtoolendline.cpp index b95bd79bb..c44d267a7 100644 --- a/src/app/tools/drawTools/vtoolendline.cpp +++ b/src/app/tools/drawTools/vtoolendline.cpp @@ -32,7 +32,7 @@ #include "../../dialogs/tools/dialogendline.h" #include "../../dialogs/tools/dialogeditwrongformula.h" #include "../../libs/vgeometry/vpointf.h" -#include "./../visualization/vistoolendline.h" +#include "../../visualization/vistoolendline.h" const QString VToolEndLine::ToolType = QStringLiteral("endLine"); diff --git a/src/app/tools/drawTools/vtoollineintersectaxis.cpp b/src/app/tools/drawTools/vtoollineintersectaxis.cpp index d40cfe561..4dbc92919 100644 --- a/src/app/tools/drawTools/vtoollineintersectaxis.cpp +++ b/src/app/tools/drawTools/vtoollineintersectaxis.cpp @@ -32,7 +32,7 @@ #include "../../dialogs/tools/dialoglineintersectaxis.h" #include "../../dialogs/tools/dialogeditwrongformula.h" #include "../../libs/vgeometry/vpointf.h" -#include "./../visualization/vistoollineintersectaxis.h" +#include "../../visualization/vistoollineintersectaxis.h" const QString VToolLineIntersectAxis::ToolType = QStringLiteral("lineIntersectAxis"); diff --git a/src/app/tools/drawTools/vtoollinepoint.h b/src/app/tools/drawTools/vtoollinepoint.h index 6b840ce4b..93d020c68 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 "../core/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 2a9b08f25..6156d55a5 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 "../core/vformula.h" +#include "../../core/vformula.h" const QString VToolPointFromCircleAndTangent::ToolType = QStringLiteral("pointFromCircleAndTangent"); diff --git a/src/app/tools/drawTools/vtoolpointofintersectioncircles.cpp b/src/app/tools/drawTools/vtoolpointofintersectioncircles.cpp index f9adc78fa..b5f7e5823 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 "../core/vformula.h" +#include "../../core/vformula.h" const QString VToolPointOfIntersectionCircles::ToolType = QStringLiteral("pointOfIntersectionCircles"); diff --git a/src/app/widgets/widgets.pri b/src/app/widgets/widgets.pri deleted file mode 100644 index 9e67bb64b..000000000 --- a/src/app/widgets/widgets.pri +++ /dev/null @@ -1,12 +0,0 @@ -# ADD TO EACH PATH $$PWD VARIABLE!!!!!! -# This need for corect working file translations.pro - -HEADERS += \ - $$PWD/vtooloptionspropertybrowser.h \ - $$PWD/vformulapropertyeditor.h \ - $$PWD/vformulaproperty.h - -SOURCES += \ - $$PWD/vtooloptionspropertybrowser.cpp \ - $$PWD/vformulapropertyeditor.cpp \ - $$PWD/vformulaproperty.cpp