From fc427a04c4d8e120782d32ba952d531ebdcda21a Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 21 Feb 2014 15:04:39 +0200 Subject: [PATCH] Change in project structure. --HG-- branch : feature --- src/dialogs/{ => app}/configdialog.cpp | 0 src/dialogs/{ => app}/configdialog.h | 0 src/dialogs/{ => app}/dialoghistory.cpp | 14 +- src/dialogs/{ => app}/dialoghistory.h | 4 +- src/dialogs/{ => app}/dialoghistory.ui | 0 src/dialogs/{ => app}/dialogincrements.cpp | 6 +- src/dialogs/{ => app}/dialogincrements.h | 4 +- src/dialogs/{ => app}/dialogincrements.ui | 0 src/dialogs/{ => app}/dialogmeasurements.cpp | 0 src/dialogs/{ => app}/dialogmeasurements.h | 0 src/dialogs/{ => app}/dialogmeasurements.ui | 0 .../{ => app}/dialogpatternproperties.cpp | 0 .../{ => app}/dialogpatternproperties.h | 2 +- .../{ => app}/dialogpatternproperties.ui | 0 .../{ => app}/dialogstandardmeasurements.cpp | 0 .../{ => app}/dialogstandardmeasurements.h | 0 .../{ => app}/dialogstandardmeasurements.ui | 0 src/dialogs/{ => app}/pages.cpp | 2 +- src/dialogs/{ => app}/pages.h | 0 src/dialogs/dialogs.h | 49 +++--- src/dialogs/dialogs.pri | 162 +++++++++--------- src/dialogs/{ => tools}/dialogalongline.cpp | 0 src/dialogs/{ => tools}/dialogalongline.h | 0 src/dialogs/{ => tools}/dialogalongline.ui | 0 src/dialogs/{ => tools}/dialogarc.cpp | 0 src/dialogs/{ => tools}/dialogarc.h | 0 src/dialogs/{ => tools}/dialogarc.ui | 0 src/dialogs/{ => tools}/dialogbisector.cpp | 0 src/dialogs/{ => tools}/dialogbisector.h | 0 src/dialogs/{ => tools}/dialogbisector.ui | 0 src/dialogs/{ => tools}/dialogcutarc.cpp | 0 src/dialogs/{ => tools}/dialogcutarc.h | 0 src/dialogs/{ => tools}/dialogcutarc.ui | 0 src/dialogs/{ => tools}/dialogcutspline.cpp | 0 src/dialogs/{ => tools}/dialogcutspline.h | 0 src/dialogs/{ => tools}/dialogcutspline.ui | 0 .../{ => tools}/dialogcutsplinepath.cpp | 0 src/dialogs/{ => tools}/dialogcutsplinepath.h | 0 .../{ => tools}/dialogcutsplinepath.ui | 0 src/dialogs/{ => tools}/dialogdetail.cpp | 0 src/dialogs/{ => tools}/dialogdetail.h | 0 src/dialogs/{ => tools}/dialogdetail.ui | 0 src/dialogs/{ => tools}/dialogendline.cpp | 0 src/dialogs/{ => tools}/dialogendline.h | 0 src/dialogs/{ => tools}/dialogendline.ui | 0 src/dialogs/{ => tools}/dialogheight.cpp | 0 src/dialogs/{ => tools}/dialogheight.h | 0 src/dialogs/{ => tools}/dialogheight.ui | 0 src/dialogs/{ => tools}/dialogline.cpp | 0 src/dialogs/{ => tools}/dialogline.h | 0 src/dialogs/{ => tools}/dialogline.ui | 0 .../{ => tools}/dialoglineintersect.cpp | 0 src/dialogs/{ => tools}/dialoglineintersect.h | 0 .../{ => tools}/dialoglineintersect.ui | 0 src/dialogs/{ => tools}/dialognormal.cpp | 0 src/dialogs/{ => tools}/dialognormal.h | 0 src/dialogs/{ => tools}/dialognormal.ui | 0 .../{ => tools}/dialogpointofcontact.cpp | 0 .../{ => tools}/dialogpointofcontact.h | 0 .../{ => tools}/dialogpointofcontact.ui | 0 .../{ => tools}/dialogpointofintersection.cpp | 0 .../{ => tools}/dialogpointofintersection.h | 0 .../{ => tools}/dialogpointofintersection.ui | 0 .../{ => tools}/dialogshoulderpoint.cpp | 0 src/dialogs/{ => tools}/dialogshoulderpoint.h | 0 .../{ => tools}/dialogshoulderpoint.ui | 0 src/dialogs/{ => tools}/dialogsinglepoint.cpp | 0 src/dialogs/{ => tools}/dialogsinglepoint.h | 0 src/dialogs/{ => tools}/dialogsinglepoint.ui | 0 src/dialogs/{ => tools}/dialogspline.cpp | 0 src/dialogs/{ => tools}/dialogspline.h | 0 src/dialogs/{ => tools}/dialogspline.ui | 0 src/dialogs/{ => tools}/dialogsplinepath.cpp | 2 +- src/dialogs/{ => tools}/dialogsplinepath.h | 2 +- src/dialogs/{ => tools}/dialogsplinepath.ui | 0 src/dialogs/{ => tools}/dialogtool.cpp | 6 +- src/dialogs/{ => tools}/dialogtool.h | 2 +- src/dialogs/{ => tools}/dialogtriangle.cpp | 0 src/dialogs/{ => tools}/dialogtriangle.h | 0 src/dialogs/{ => tools}/dialogtriangle.ui | 0 .../{ => tools}/dialoguniondetails.cpp | 0 src/dialogs/{ => tools}/dialoguniondetails.h | 0 src/dialogs/{ => tools}/dialoguniondetails.ui | 0 src/tools/drawTools/vdrawtool.h | 2 +- src/tools/drawTools/vtoolalongline.cpp | 2 +- src/tools/drawTools/vtoolarc.cpp | 2 +- src/tools/drawTools/vtoolbisector.cpp | 2 +- src/tools/drawTools/vtoolcutarc.cpp | 2 +- src/tools/drawTools/vtoolcutspline.cpp | 2 +- src/tools/drawTools/vtoolcutsplinepath.cpp | 2 +- src/tools/drawTools/vtoolendline.cpp | 2 +- src/tools/drawTools/vtoolheight.cpp | 2 +- src/tools/drawTools/vtoolline.cpp | 2 +- src/tools/drawTools/vtoolline.h | 2 +- src/tools/drawTools/vtoollineintersect.cpp | 2 +- src/tools/drawTools/vtoolnormal.cpp | 2 +- src/tools/drawTools/vtoolpointofcontact.cpp | 2 +- .../drawTools/vtoolpointofintersection.cpp | 2 +- src/tools/drawTools/vtoolshoulderpoint.cpp | 2 +- src/tools/drawTools/vtoolsinglepoint.cpp | 2 +- src/tools/drawTools/vtoolspline.cpp | 2 +- src/tools/drawTools/vtoolsplinepath.cpp | 2 +- src/tools/drawTools/vtooltriangle.cpp | 2 +- src/tools/vtooldetail.h | 2 +- src/tools/vtooluniondetails.h | 2 +- 105 files changed, 150 insertions(+), 149 deletions(-) rename src/dialogs/{ => app}/configdialog.cpp (100%) rename src/dialogs/{ => app}/configdialog.h (100%) rename src/dialogs/{ => app}/dialoghistory.cpp (98%) rename src/dialogs/{ => app}/dialoghistory.h (98%) rename src/dialogs/{ => app}/dialoghistory.ui (100%) rename src/dialogs/{ => app}/dialogincrements.cpp (99%) rename src/dialogs/{ => app}/dialogincrements.h (98%) rename src/dialogs/{ => app}/dialogincrements.ui (100%) rename src/dialogs/{ => app}/dialogmeasurements.cpp (100%) rename src/dialogs/{ => app}/dialogmeasurements.h (100%) rename src/dialogs/{ => app}/dialogmeasurements.ui (100%) rename src/dialogs/{ => app}/dialogpatternproperties.cpp (100%) rename src/dialogs/{ => app}/dialogpatternproperties.h (98%) rename src/dialogs/{ => app}/dialogpatternproperties.ui (100%) rename src/dialogs/{ => app}/dialogstandardmeasurements.cpp (100%) rename src/dialogs/{ => app}/dialogstandardmeasurements.h (100%) rename src/dialogs/{ => app}/dialogstandardmeasurements.ui (100%) rename src/dialogs/{ => app}/pages.cpp (99%) rename src/dialogs/{ => app}/pages.h (100%) rename src/dialogs/{ => tools}/dialogalongline.cpp (100%) rename src/dialogs/{ => tools}/dialogalongline.h (100%) rename src/dialogs/{ => tools}/dialogalongline.ui (100%) rename src/dialogs/{ => tools}/dialogarc.cpp (100%) rename src/dialogs/{ => tools}/dialogarc.h (100%) rename src/dialogs/{ => tools}/dialogarc.ui (100%) rename src/dialogs/{ => tools}/dialogbisector.cpp (100%) rename src/dialogs/{ => tools}/dialogbisector.h (100%) rename src/dialogs/{ => tools}/dialogbisector.ui (100%) rename src/dialogs/{ => tools}/dialogcutarc.cpp (100%) rename src/dialogs/{ => tools}/dialogcutarc.h (100%) rename src/dialogs/{ => tools}/dialogcutarc.ui (100%) rename src/dialogs/{ => tools}/dialogcutspline.cpp (100%) rename src/dialogs/{ => tools}/dialogcutspline.h (100%) rename src/dialogs/{ => tools}/dialogcutspline.ui (100%) rename src/dialogs/{ => tools}/dialogcutsplinepath.cpp (100%) rename src/dialogs/{ => tools}/dialogcutsplinepath.h (100%) rename src/dialogs/{ => tools}/dialogcutsplinepath.ui (100%) rename src/dialogs/{ => tools}/dialogdetail.cpp (100%) rename src/dialogs/{ => tools}/dialogdetail.h (100%) rename src/dialogs/{ => tools}/dialogdetail.ui (100%) rename src/dialogs/{ => tools}/dialogendline.cpp (100%) rename src/dialogs/{ => tools}/dialogendline.h (100%) rename src/dialogs/{ => tools}/dialogendline.ui (100%) rename src/dialogs/{ => tools}/dialogheight.cpp (100%) rename src/dialogs/{ => tools}/dialogheight.h (100%) rename src/dialogs/{ => tools}/dialogheight.ui (100%) rename src/dialogs/{ => tools}/dialogline.cpp (100%) rename src/dialogs/{ => tools}/dialogline.h (100%) rename src/dialogs/{ => tools}/dialogline.ui (100%) rename src/dialogs/{ => tools}/dialoglineintersect.cpp (100%) rename src/dialogs/{ => tools}/dialoglineintersect.h (100%) rename src/dialogs/{ => tools}/dialoglineintersect.ui (100%) rename src/dialogs/{ => tools}/dialognormal.cpp (100%) rename src/dialogs/{ => tools}/dialognormal.h (100%) rename src/dialogs/{ => tools}/dialognormal.ui (100%) rename src/dialogs/{ => tools}/dialogpointofcontact.cpp (100%) rename src/dialogs/{ => tools}/dialogpointofcontact.h (100%) rename src/dialogs/{ => tools}/dialogpointofcontact.ui (100%) rename src/dialogs/{ => tools}/dialogpointofintersection.cpp (100%) rename src/dialogs/{ => tools}/dialogpointofintersection.h (100%) rename src/dialogs/{ => tools}/dialogpointofintersection.ui (100%) rename src/dialogs/{ => tools}/dialogshoulderpoint.cpp (100%) rename src/dialogs/{ => tools}/dialogshoulderpoint.h (100%) rename src/dialogs/{ => tools}/dialogshoulderpoint.ui (100%) rename src/dialogs/{ => tools}/dialogsinglepoint.cpp (100%) rename src/dialogs/{ => tools}/dialogsinglepoint.h (100%) rename src/dialogs/{ => tools}/dialogsinglepoint.ui (100%) rename src/dialogs/{ => tools}/dialogspline.cpp (100%) rename src/dialogs/{ => tools}/dialogspline.h (100%) rename src/dialogs/{ => tools}/dialogspline.ui (100%) rename src/dialogs/{ => tools}/dialogsplinepath.cpp (99%) rename src/dialogs/{ => tools}/dialogsplinepath.h (99%) rename src/dialogs/{ => tools}/dialogsplinepath.ui (100%) rename src/dialogs/{ => tools}/dialogtool.cpp (99%) rename src/dialogs/{ => tools}/dialogtool.h (99%) rename src/dialogs/{ => tools}/dialogtriangle.cpp (100%) rename src/dialogs/{ => tools}/dialogtriangle.h (100%) rename src/dialogs/{ => tools}/dialogtriangle.ui (100%) rename src/dialogs/{ => tools}/dialoguniondetails.cpp (100%) rename src/dialogs/{ => tools}/dialoguniondetails.h (100%) rename src/dialogs/{ => tools}/dialoguniondetails.ui (100%) diff --git a/src/dialogs/configdialog.cpp b/src/dialogs/app/configdialog.cpp similarity index 100% rename from src/dialogs/configdialog.cpp rename to src/dialogs/app/configdialog.cpp diff --git a/src/dialogs/configdialog.h b/src/dialogs/app/configdialog.h similarity index 100% rename from src/dialogs/configdialog.h rename to src/dialogs/app/configdialog.h diff --git a/src/dialogs/dialoghistory.cpp b/src/dialogs/app/dialoghistory.cpp similarity index 98% rename from src/dialogs/dialoghistory.cpp rename to src/dialogs/app/dialoghistory.cpp index 2a6794364..ac3e83325 100644 --- a/src/dialogs/dialoghistory.cpp +++ b/src/dialogs/app/dialoghistory.cpp @@ -28,13 +28,13 @@ #include "dialoghistory.h" #include "ui_dialoghistory.h" -#include "../geometry/varc.h" -#include "../geometry/vspline.h" -#include "../geometry/vsplinepath.h" -#include "../tools/vabstracttool.h" -#include "../tools/drawTools/vtoolcutspline.h" -#include "../tools/drawTools/vtoolcutsplinepath.h" -#include "../tools/drawTools/vtoolcutarc.h" +#include "../../geometry/varc.h" +#include "../../geometry/vspline.h" +#include "../../geometry/vsplinepath.h" +#include "../../tools/vabstracttool.h" +#include "../../tools/drawTools/vtoolcutspline.h" +#include "../../tools/drawTools/vtoolcutsplinepath.h" +#include "../../tools/drawTools/vtoolcutarc.h" #include #include diff --git a/src/dialogs/dialoghistory.h b/src/dialogs/app/dialoghistory.h similarity index 98% rename from src/dialogs/dialoghistory.h rename to src/dialogs/app/dialoghistory.h index 120fff0ee..5670c498c 100644 --- a/src/dialogs/dialoghistory.h +++ b/src/dialogs/app/dialoghistory.h @@ -29,8 +29,8 @@ #ifndef DIALOGHISTORY_H #define DIALOGHISTORY_H -#include "dialogtool.h" -#include "../xml/vdomdocument.h" +#include "../tools/dialogtool.h" +#include "../../xml/vdomdocument.h" namespace Ui { diff --git a/src/dialogs/dialoghistory.ui b/src/dialogs/app/dialoghistory.ui similarity index 100% rename from src/dialogs/dialoghistory.ui rename to src/dialogs/app/dialoghistory.ui diff --git a/src/dialogs/dialogincrements.cpp b/src/dialogs/app/dialogincrements.cpp similarity index 99% rename from src/dialogs/dialogincrements.cpp rename to src/dialogs/app/dialogincrements.cpp index f33dda500..daf940cc1 100644 --- a/src/dialogs/dialogincrements.cpp +++ b/src/dialogs/app/dialogincrements.cpp @@ -28,9 +28,9 @@ #include "dialogincrements.h" #include "ui_dialogincrements.h" -#include "../widgets/doubledelegate.h" -#include "../widgets/textdelegate.h" -#include "../exception/vexception.h" +#include "../../widgets/doubledelegate.h" +#include "../../widgets/textdelegate.h" +#include "../../exception/vexception.h" #include diff --git a/src/dialogs/dialogincrements.h b/src/dialogs/app/dialogincrements.h similarity index 98% rename from src/dialogs/dialogincrements.h rename to src/dialogs/app/dialogincrements.h index 156e0c78f..5f42b9b08 100644 --- a/src/dialogs/dialogincrements.h +++ b/src/dialogs/app/dialogincrements.h @@ -29,8 +29,8 @@ #ifndef DIALOGINCREMENTS_H #define DIALOGINCREMENTS_H -#include "dialogtool.h" -#include "../xml/vdomdocument.h" +#include "../tools/dialogtool.h" +#include "../../xml/vdomdocument.h" namespace Ui { diff --git a/src/dialogs/dialogincrements.ui b/src/dialogs/app/dialogincrements.ui similarity index 100% rename from src/dialogs/dialogincrements.ui rename to src/dialogs/app/dialogincrements.ui diff --git a/src/dialogs/dialogmeasurements.cpp b/src/dialogs/app/dialogmeasurements.cpp similarity index 100% rename from src/dialogs/dialogmeasurements.cpp rename to src/dialogs/app/dialogmeasurements.cpp diff --git a/src/dialogs/dialogmeasurements.h b/src/dialogs/app/dialogmeasurements.h similarity index 100% rename from src/dialogs/dialogmeasurements.h rename to src/dialogs/app/dialogmeasurements.h diff --git a/src/dialogs/dialogmeasurements.ui b/src/dialogs/app/dialogmeasurements.ui similarity index 100% rename from src/dialogs/dialogmeasurements.ui rename to src/dialogs/app/dialogmeasurements.ui diff --git a/src/dialogs/dialogpatternproperties.cpp b/src/dialogs/app/dialogpatternproperties.cpp similarity index 100% rename from src/dialogs/dialogpatternproperties.cpp rename to src/dialogs/app/dialogpatternproperties.cpp diff --git a/src/dialogs/dialogpatternproperties.h b/src/dialogs/app/dialogpatternproperties.h similarity index 98% rename from src/dialogs/dialogpatternproperties.h rename to src/dialogs/app/dialogpatternproperties.h index d65c834d8..10f47fe07 100644 --- a/src/dialogs/dialogpatternproperties.h +++ b/src/dialogs/app/dialogpatternproperties.h @@ -30,7 +30,7 @@ #define DIALOGPATTERNPROPERTIES_H #include -#include "../xml/vdomdocument.h" +#include "../../xml/vdomdocument.h" namespace Ui { class DialogPatternProperties; diff --git a/src/dialogs/dialogpatternproperties.ui b/src/dialogs/app/dialogpatternproperties.ui similarity index 100% rename from src/dialogs/dialogpatternproperties.ui rename to src/dialogs/app/dialogpatternproperties.ui diff --git a/src/dialogs/dialogstandardmeasurements.cpp b/src/dialogs/app/dialogstandardmeasurements.cpp similarity index 100% rename from src/dialogs/dialogstandardmeasurements.cpp rename to src/dialogs/app/dialogstandardmeasurements.cpp diff --git a/src/dialogs/dialogstandardmeasurements.h b/src/dialogs/app/dialogstandardmeasurements.h similarity index 100% rename from src/dialogs/dialogstandardmeasurements.h rename to src/dialogs/app/dialogstandardmeasurements.h diff --git a/src/dialogs/dialogstandardmeasurements.ui b/src/dialogs/app/dialogstandardmeasurements.ui similarity index 100% rename from src/dialogs/dialogstandardmeasurements.ui rename to src/dialogs/app/dialogstandardmeasurements.ui diff --git a/src/dialogs/pages.cpp b/src/dialogs/app/pages.cpp similarity index 99% rename from src/dialogs/pages.cpp rename to src/dialogs/app/pages.cpp index eecaf4e58..f1772d289 100644 --- a/src/dialogs/pages.cpp +++ b/src/dialogs/app/pages.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "pages.h" -#include "../options.h" +#include "../../options.h" ConfigurationPage::ConfigurationPage(QWidget *parent): QWidget(parent), autoSaveCheck(0), autoTime(0), langCombo(0), osOptionCheck(0), langChanged(false) diff --git a/src/dialogs/pages.h b/src/dialogs/app/pages.h similarity index 100% rename from src/dialogs/pages.h rename to src/dialogs/app/pages.h diff --git a/src/dialogs/dialogs.h b/src/dialogs/dialogs.h index 42bc0aa48..99f4ec34e 100644 --- a/src/dialogs/dialogs.h +++ b/src/dialogs/dialogs.h @@ -29,29 +29,30 @@ #ifndef DIALOGS_H #define DIALOGS_H -#include "dialogalongline.h" -#include "dialogarc.h" -#include "dialogbisector.h" -#include "dialogdetail.h" -#include "dialogendline.h" -#include "dialoghistory.h" -#include "dialogincrements.h" -#include "dialogline.h" -#include "dialoglineintersect.h" -#include "dialognormal.h" -#include "dialogpointofcontact.h" -#include "dialogshoulderpoint.h" -#include "dialogsinglepoint.h" -#include "dialogspline.h" -#include "dialogsplinepath.h" -#include "dialogheight.h" -#include "dialogcutarc.h" -#include "dialogcutspline.h" -#include "dialogcutsplinepath.h" -#include "dialoguniondetails.h" -#include "dialogtriangle.h" -#include "dialogpointofintersection.h" -#include "configdialog.h" -#include "dialogpatternproperties.h" +#include "tools/dialogalongline.h" +#include "tools/dialogarc.h" +#include "tools/dialogbisector.h" +#include "tools/dialogdetail.h" +#include "tools/dialogendline.h" +#include "tools/dialogline.h" +#include "tools/dialoglineintersect.h" +#include "tools/dialognormal.h" +#include "tools/dialogpointofcontact.h" +#include "tools/dialogshoulderpoint.h" +#include "tools/dialogsinglepoint.h" +#include "tools/dialogspline.h" +#include "tools/dialogsplinepath.h" +#include "tools/dialogheight.h" +#include "tools/dialogcutarc.h" +#include "tools/dialogcutspline.h" +#include "tools/dialogcutsplinepath.h" +#include "tools/dialoguniondetails.h" +#include "tools/dialogtriangle.h" +#include "tools/dialogpointofintersection.h" + +#include "app/dialoghistory.h" +#include "app/dialogincrements.h" +#include "app/configdialog.h" +#include "app/dialogpatternproperties.h" #endif // DIALOGS_H diff --git a/src/dialogs/dialogs.pri b/src/dialogs/dialogs.pri index 36ad18cd7..d4267b31c 100644 --- a/src/dialogs/dialogs.pri +++ b/src/dialogs/dialogs.pri @@ -1,87 +1,87 @@ HEADERS += \ - src/dialogs/dialogtriangle.h \ - src/dialogs/dialogtool.h \ - src/dialogs/dialogsplinepath.h \ - src/dialogs/dialogspline.h \ - src/dialogs/dialogsinglepoint.h \ - src/dialogs/dialogshoulderpoint.h \ src/dialogs/dialogs.h \ - src/dialogs/dialogpointofintersection.h \ - src/dialogs/dialogpointofcontact.h \ - src/dialogs/dialognormal.h \ - src/dialogs/dialoglineintersect.h \ - src/dialogs/dialogline.h \ - src/dialogs/dialogincrements.h \ - src/dialogs/dialoghistory.h \ - src/dialogs/dialogheight.h \ - src/dialogs/dialogendline.h \ - src/dialogs/dialogdetail.h \ - src/dialogs/dialogbisector.h \ - src/dialogs/dialogarc.h \ - src/dialogs/dialogalongline.h \ - src/dialogs/dialogcutspline.h \ - src/dialogs/dialogcutsplinepath.h \ - src/dialogs/dialoguniondetails.h \ - src/dialogs/dialogcutarc.h \ - src/dialogs/configdialog.h \ - src/dialogs/pages.h \ - src/dialogs/dialogpatternproperties.h \ - src/dialogs/dialogmeasurements.h \ - src/dialogs/dialogstandardmeasurements.h + src/dialogs/tools/dialogtriangle.h \ + src/dialogs/tools/dialogtool.h \ + src/dialogs/tools/dialogsplinepath.h \ + src/dialogs/tools/dialogspline.h \ + src/dialogs/tools/dialogsinglepoint.h \ + src/dialogs/tools/dialogshoulderpoint.h \ + src/dialogs/tools/dialogpointofintersection.h \ + src/dialogs/tools/dialogpointofcontact.h \ + src/dialogs/tools/dialognormal.h \ + src/dialogs/tools/dialoglineintersect.h \ + src/dialogs/tools/dialogline.h \ + src/dialogs/tools/dialogheight.h \ + src/dialogs/tools/dialogendline.h \ + src/dialogs/tools/dialogdetail.h \ + src/dialogs/tools/dialogbisector.h \ + src/dialogs/tools/dialogarc.h \ + src/dialogs/tools/dialogalongline.h \ + src/dialogs/tools/dialogcutspline.h \ + src/dialogs/tools/dialogcutsplinepath.h \ + src/dialogs/tools/dialoguniondetails.h \ + src/dialogs/tools/dialogcutarc.h \ + src/dialogs/app/dialogincrements.h \ + src/dialogs/app/dialoghistory.h \ + src/dialogs/app/configdialog.h \ + src/dialogs/app/pages.h \ + src/dialogs/app/dialogpatternproperties.h \ + src/dialogs/app/dialogmeasurements.h \ + src/dialogs/app/dialogstandardmeasurements.h SOURCES += \ - src/dialogs/dialogtriangle.cpp \ - src/dialogs/dialogtool.cpp \ - src/dialogs/dialogsplinepath.cpp \ - src/dialogs/dialogspline.cpp \ - src/dialogs/dialogsinglepoint.cpp \ - src/dialogs/dialogshoulderpoint.cpp \ - src/dialogs/dialogpointofintersection.cpp \ - src/dialogs/dialogpointofcontact.cpp \ - src/dialogs/dialognormal.cpp \ - src/dialogs/dialoglineintersect.cpp \ - src/dialogs/dialogline.cpp \ - src/dialogs/dialogincrements.cpp \ - src/dialogs/dialoghistory.cpp \ - src/dialogs/dialogheight.cpp \ - src/dialogs/dialogendline.cpp \ - src/dialogs/dialogdetail.cpp \ - src/dialogs/dialogbisector.cpp \ - src/dialogs/dialogarc.cpp \ - src/dialogs/dialogalongline.cpp \ - src/dialogs/dialogcutspline.cpp \ - src/dialogs/dialogcutsplinepath.cpp \ - src/dialogs/dialoguniondetails.cpp \ - src/dialogs/dialogcutarc.cpp \ - src/dialogs/configdialog.cpp \ - src/dialogs/pages.cpp \ - src/dialogs/dialogpatternproperties.cpp \ - src/dialogs/dialogmeasurements.cpp \ - src/dialogs/dialogstandardmeasurements.cpp + src/dialogs/tools/dialogtriangle.cpp \ + src/dialogs/tools/dialogtool.cpp \ + src/dialogs/tools/dialogsplinepath.cpp \ + src/dialogs/tools/dialogspline.cpp \ + src/dialogs/tools/dialogsinglepoint.cpp \ + src/dialogs/tools/dialogshoulderpoint.cpp \ + src/dialogs/tools/dialogpointofintersection.cpp \ + src/dialogs/tools/dialogpointofcontact.cpp \ + src/dialogs/tools/dialognormal.cpp \ + src/dialogs/tools/dialoglineintersect.cpp \ + src/dialogs/tools/dialogline.cpp \ + src/dialogs/tools/dialogheight.cpp \ + src/dialogs/tools/dialogendline.cpp \ + src/dialogs/tools/dialogdetail.cpp \ + src/dialogs/tools/dialogbisector.cpp \ + src/dialogs/tools/dialogarc.cpp \ + src/dialogs/tools/dialogalongline.cpp \ + src/dialogs/tools/dialogcutspline.cpp \ + src/dialogs/tools/dialogcutsplinepath.cpp \ + src/dialogs/tools/dialoguniondetails.cpp \ + src/dialogs/tools/dialogcutarc.cpp \ + src/dialogs/app/dialogincrements.cpp \ + src/dialogs/app/dialoghistory.cpp \ + src/dialogs/app/configdialog.cpp \ + src/dialogs/app/pages.cpp \ + src/dialogs/app/dialogpatternproperties.cpp \ + src/dialogs/app/dialogmeasurements.cpp \ + src/dialogs/app/dialogstandardmeasurements.cpp FORMS += \ - src/dialogs/dialogtriangle.ui \ - src/dialogs/dialogsplinepath.ui \ - src/dialogs/dialogspline.ui \ - src/dialogs/dialogsinglepoint.ui \ - src/dialogs/dialogshoulderpoint.ui \ - src/dialogs/dialogpointofintersection.ui \ - src/dialogs/dialogpointofcontact.ui \ - src/dialogs/dialognormal.ui \ - src/dialogs/dialoglineintersect.ui \ - src/dialogs/dialogline.ui \ - src/dialogs/dialogincrements.ui \ - src/dialogs/dialoghistory.ui \ - src/dialogs/dialogheight.ui \ - src/dialogs/dialogendline.ui \ - src/dialogs/dialogdetail.ui \ - src/dialogs/dialogbisector.ui \ - src/dialogs/dialogarc.ui \ - src/dialogs/dialogalongline.ui \ - src/dialogs/dialogcutspline.ui \ - src/dialogs/dialogcutsplinepath.ui \ - src/dialogs/dialoguniondetails.ui \ - src/dialogs/dialogcutarc.ui \ - src/dialogs/dialogpatternproperties.ui \ - src/dialogs/dialogmeasurements.ui \ - src/dialogs/dialogstandardmeasurements.ui + src/dialogs/tools/dialogtriangle.ui \ + src/dialogs/tools/dialogsplinepath.ui \ + src/dialogs/tools/dialogspline.ui \ + src/dialogs/tools/dialogsinglepoint.ui \ + src/dialogs/tools/dialogshoulderpoint.ui \ + src/dialogs/tools/dialogpointofintersection.ui \ + src/dialogs/tools/dialogpointofcontact.ui \ + src/dialogs/tools/dialognormal.ui \ + src/dialogs/tools/dialoglineintersect.ui \ + src/dialogs/tools/dialogline.ui \ + src/dialogs/tools/dialogheight.ui \ + src/dialogs/tools/dialogendline.ui \ + src/dialogs/tools/dialogdetail.ui \ + src/dialogs/tools/dialogbisector.ui \ + src/dialogs/tools/dialogarc.ui \ + src/dialogs/tools/dialogalongline.ui \ + src/dialogs/tools/dialogcutspline.ui \ + src/dialogs/tools/dialogcutsplinepath.ui \ + src/dialogs/tools/dialoguniondetails.ui \ + src/dialogs/tools/dialogcutarc.ui \ + src/dialogs/app/dialogincrements.ui \ + src/dialogs/app/dialoghistory.ui \ + src/dialogs/app/dialogpatternproperties.ui \ + src/dialogs/app/dialogmeasurements.ui \ + src/dialogs/app/dialogstandardmeasurements.ui diff --git a/src/dialogs/dialogalongline.cpp b/src/dialogs/tools/dialogalongline.cpp similarity index 100% rename from src/dialogs/dialogalongline.cpp rename to src/dialogs/tools/dialogalongline.cpp diff --git a/src/dialogs/dialogalongline.h b/src/dialogs/tools/dialogalongline.h similarity index 100% rename from src/dialogs/dialogalongline.h rename to src/dialogs/tools/dialogalongline.h diff --git a/src/dialogs/dialogalongline.ui b/src/dialogs/tools/dialogalongline.ui similarity index 100% rename from src/dialogs/dialogalongline.ui rename to src/dialogs/tools/dialogalongline.ui diff --git a/src/dialogs/dialogarc.cpp b/src/dialogs/tools/dialogarc.cpp similarity index 100% rename from src/dialogs/dialogarc.cpp rename to src/dialogs/tools/dialogarc.cpp diff --git a/src/dialogs/dialogarc.h b/src/dialogs/tools/dialogarc.h similarity index 100% rename from src/dialogs/dialogarc.h rename to src/dialogs/tools/dialogarc.h diff --git a/src/dialogs/dialogarc.ui b/src/dialogs/tools/dialogarc.ui similarity index 100% rename from src/dialogs/dialogarc.ui rename to src/dialogs/tools/dialogarc.ui diff --git a/src/dialogs/dialogbisector.cpp b/src/dialogs/tools/dialogbisector.cpp similarity index 100% rename from src/dialogs/dialogbisector.cpp rename to src/dialogs/tools/dialogbisector.cpp diff --git a/src/dialogs/dialogbisector.h b/src/dialogs/tools/dialogbisector.h similarity index 100% rename from src/dialogs/dialogbisector.h rename to src/dialogs/tools/dialogbisector.h diff --git a/src/dialogs/dialogbisector.ui b/src/dialogs/tools/dialogbisector.ui similarity index 100% rename from src/dialogs/dialogbisector.ui rename to src/dialogs/tools/dialogbisector.ui diff --git a/src/dialogs/dialogcutarc.cpp b/src/dialogs/tools/dialogcutarc.cpp similarity index 100% rename from src/dialogs/dialogcutarc.cpp rename to src/dialogs/tools/dialogcutarc.cpp diff --git a/src/dialogs/dialogcutarc.h b/src/dialogs/tools/dialogcutarc.h similarity index 100% rename from src/dialogs/dialogcutarc.h rename to src/dialogs/tools/dialogcutarc.h diff --git a/src/dialogs/dialogcutarc.ui b/src/dialogs/tools/dialogcutarc.ui similarity index 100% rename from src/dialogs/dialogcutarc.ui rename to src/dialogs/tools/dialogcutarc.ui diff --git a/src/dialogs/dialogcutspline.cpp b/src/dialogs/tools/dialogcutspline.cpp similarity index 100% rename from src/dialogs/dialogcutspline.cpp rename to src/dialogs/tools/dialogcutspline.cpp diff --git a/src/dialogs/dialogcutspline.h b/src/dialogs/tools/dialogcutspline.h similarity index 100% rename from src/dialogs/dialogcutspline.h rename to src/dialogs/tools/dialogcutspline.h diff --git a/src/dialogs/dialogcutspline.ui b/src/dialogs/tools/dialogcutspline.ui similarity index 100% rename from src/dialogs/dialogcutspline.ui rename to src/dialogs/tools/dialogcutspline.ui diff --git a/src/dialogs/dialogcutsplinepath.cpp b/src/dialogs/tools/dialogcutsplinepath.cpp similarity index 100% rename from src/dialogs/dialogcutsplinepath.cpp rename to src/dialogs/tools/dialogcutsplinepath.cpp diff --git a/src/dialogs/dialogcutsplinepath.h b/src/dialogs/tools/dialogcutsplinepath.h similarity index 100% rename from src/dialogs/dialogcutsplinepath.h rename to src/dialogs/tools/dialogcutsplinepath.h diff --git a/src/dialogs/dialogcutsplinepath.ui b/src/dialogs/tools/dialogcutsplinepath.ui similarity index 100% rename from src/dialogs/dialogcutsplinepath.ui rename to src/dialogs/tools/dialogcutsplinepath.ui diff --git a/src/dialogs/dialogdetail.cpp b/src/dialogs/tools/dialogdetail.cpp similarity index 100% rename from src/dialogs/dialogdetail.cpp rename to src/dialogs/tools/dialogdetail.cpp diff --git a/src/dialogs/dialogdetail.h b/src/dialogs/tools/dialogdetail.h similarity index 100% rename from src/dialogs/dialogdetail.h rename to src/dialogs/tools/dialogdetail.h diff --git a/src/dialogs/dialogdetail.ui b/src/dialogs/tools/dialogdetail.ui similarity index 100% rename from src/dialogs/dialogdetail.ui rename to src/dialogs/tools/dialogdetail.ui diff --git a/src/dialogs/dialogendline.cpp b/src/dialogs/tools/dialogendline.cpp similarity index 100% rename from src/dialogs/dialogendline.cpp rename to src/dialogs/tools/dialogendline.cpp diff --git a/src/dialogs/dialogendline.h b/src/dialogs/tools/dialogendline.h similarity index 100% rename from src/dialogs/dialogendline.h rename to src/dialogs/tools/dialogendline.h diff --git a/src/dialogs/dialogendline.ui b/src/dialogs/tools/dialogendline.ui similarity index 100% rename from src/dialogs/dialogendline.ui rename to src/dialogs/tools/dialogendline.ui diff --git a/src/dialogs/dialogheight.cpp b/src/dialogs/tools/dialogheight.cpp similarity index 100% rename from src/dialogs/dialogheight.cpp rename to src/dialogs/tools/dialogheight.cpp diff --git a/src/dialogs/dialogheight.h b/src/dialogs/tools/dialogheight.h similarity index 100% rename from src/dialogs/dialogheight.h rename to src/dialogs/tools/dialogheight.h diff --git a/src/dialogs/dialogheight.ui b/src/dialogs/tools/dialogheight.ui similarity index 100% rename from src/dialogs/dialogheight.ui rename to src/dialogs/tools/dialogheight.ui diff --git a/src/dialogs/dialogline.cpp b/src/dialogs/tools/dialogline.cpp similarity index 100% rename from src/dialogs/dialogline.cpp rename to src/dialogs/tools/dialogline.cpp diff --git a/src/dialogs/dialogline.h b/src/dialogs/tools/dialogline.h similarity index 100% rename from src/dialogs/dialogline.h rename to src/dialogs/tools/dialogline.h diff --git a/src/dialogs/dialogline.ui b/src/dialogs/tools/dialogline.ui similarity index 100% rename from src/dialogs/dialogline.ui rename to src/dialogs/tools/dialogline.ui diff --git a/src/dialogs/dialoglineintersect.cpp b/src/dialogs/tools/dialoglineintersect.cpp similarity index 100% rename from src/dialogs/dialoglineintersect.cpp rename to src/dialogs/tools/dialoglineintersect.cpp diff --git a/src/dialogs/dialoglineintersect.h b/src/dialogs/tools/dialoglineintersect.h similarity index 100% rename from src/dialogs/dialoglineintersect.h rename to src/dialogs/tools/dialoglineintersect.h diff --git a/src/dialogs/dialoglineintersect.ui b/src/dialogs/tools/dialoglineintersect.ui similarity index 100% rename from src/dialogs/dialoglineintersect.ui rename to src/dialogs/tools/dialoglineintersect.ui diff --git a/src/dialogs/dialognormal.cpp b/src/dialogs/tools/dialognormal.cpp similarity index 100% rename from src/dialogs/dialognormal.cpp rename to src/dialogs/tools/dialognormal.cpp diff --git a/src/dialogs/dialognormal.h b/src/dialogs/tools/dialognormal.h similarity index 100% rename from src/dialogs/dialognormal.h rename to src/dialogs/tools/dialognormal.h diff --git a/src/dialogs/dialognormal.ui b/src/dialogs/tools/dialognormal.ui similarity index 100% rename from src/dialogs/dialognormal.ui rename to src/dialogs/tools/dialognormal.ui diff --git a/src/dialogs/dialogpointofcontact.cpp b/src/dialogs/tools/dialogpointofcontact.cpp similarity index 100% rename from src/dialogs/dialogpointofcontact.cpp rename to src/dialogs/tools/dialogpointofcontact.cpp diff --git a/src/dialogs/dialogpointofcontact.h b/src/dialogs/tools/dialogpointofcontact.h similarity index 100% rename from src/dialogs/dialogpointofcontact.h rename to src/dialogs/tools/dialogpointofcontact.h diff --git a/src/dialogs/dialogpointofcontact.ui b/src/dialogs/tools/dialogpointofcontact.ui similarity index 100% rename from src/dialogs/dialogpointofcontact.ui rename to src/dialogs/tools/dialogpointofcontact.ui diff --git a/src/dialogs/dialogpointofintersection.cpp b/src/dialogs/tools/dialogpointofintersection.cpp similarity index 100% rename from src/dialogs/dialogpointofintersection.cpp rename to src/dialogs/tools/dialogpointofintersection.cpp diff --git a/src/dialogs/dialogpointofintersection.h b/src/dialogs/tools/dialogpointofintersection.h similarity index 100% rename from src/dialogs/dialogpointofintersection.h rename to src/dialogs/tools/dialogpointofintersection.h diff --git a/src/dialogs/dialogpointofintersection.ui b/src/dialogs/tools/dialogpointofintersection.ui similarity index 100% rename from src/dialogs/dialogpointofintersection.ui rename to src/dialogs/tools/dialogpointofintersection.ui diff --git a/src/dialogs/dialogshoulderpoint.cpp b/src/dialogs/tools/dialogshoulderpoint.cpp similarity index 100% rename from src/dialogs/dialogshoulderpoint.cpp rename to src/dialogs/tools/dialogshoulderpoint.cpp diff --git a/src/dialogs/dialogshoulderpoint.h b/src/dialogs/tools/dialogshoulderpoint.h similarity index 100% rename from src/dialogs/dialogshoulderpoint.h rename to src/dialogs/tools/dialogshoulderpoint.h diff --git a/src/dialogs/dialogshoulderpoint.ui b/src/dialogs/tools/dialogshoulderpoint.ui similarity index 100% rename from src/dialogs/dialogshoulderpoint.ui rename to src/dialogs/tools/dialogshoulderpoint.ui diff --git a/src/dialogs/dialogsinglepoint.cpp b/src/dialogs/tools/dialogsinglepoint.cpp similarity index 100% rename from src/dialogs/dialogsinglepoint.cpp rename to src/dialogs/tools/dialogsinglepoint.cpp diff --git a/src/dialogs/dialogsinglepoint.h b/src/dialogs/tools/dialogsinglepoint.h similarity index 100% rename from src/dialogs/dialogsinglepoint.h rename to src/dialogs/tools/dialogsinglepoint.h diff --git a/src/dialogs/dialogsinglepoint.ui b/src/dialogs/tools/dialogsinglepoint.ui similarity index 100% rename from src/dialogs/dialogsinglepoint.ui rename to src/dialogs/tools/dialogsinglepoint.ui diff --git a/src/dialogs/dialogspline.cpp b/src/dialogs/tools/dialogspline.cpp similarity index 100% rename from src/dialogs/dialogspline.cpp rename to src/dialogs/tools/dialogspline.cpp diff --git a/src/dialogs/dialogspline.h b/src/dialogs/tools/dialogspline.h similarity index 100% rename from src/dialogs/dialogspline.h rename to src/dialogs/tools/dialogspline.h diff --git a/src/dialogs/dialogspline.ui b/src/dialogs/tools/dialogspline.ui similarity index 100% rename from src/dialogs/dialogspline.ui rename to src/dialogs/tools/dialogspline.ui diff --git a/src/dialogs/dialogsplinepath.cpp b/src/dialogs/tools/dialogsplinepath.cpp similarity index 99% rename from src/dialogs/dialogsplinepath.cpp rename to src/dialogs/tools/dialogsplinepath.cpp index 058dc5a9a..7f80afc83 100644 --- a/src/dialogs/dialogsplinepath.cpp +++ b/src/dialogs/tools/dialogsplinepath.cpp @@ -28,7 +28,7 @@ #include "dialogsplinepath.h" #include "ui_dialogsplinepath.h" -#include "../geometry/vsplinepoint.h" +#include "../../geometry/vsplinepoint.h" #include diff --git a/src/dialogs/dialogsplinepath.h b/src/dialogs/tools/dialogsplinepath.h similarity index 99% rename from src/dialogs/dialogsplinepath.h rename to src/dialogs/tools/dialogsplinepath.h index c88713f55..fe33e24d6 100644 --- a/src/dialogs/dialogsplinepath.h +++ b/src/dialogs/tools/dialogsplinepath.h @@ -30,7 +30,7 @@ #define DIALOGSPLINEPATH_H #include "dialogtool.h" -#include "../geometry/vsplinepath.h" +#include "../../geometry/vsplinepath.h" namespace Ui { diff --git a/src/dialogs/dialogsplinepath.ui b/src/dialogs/tools/dialogsplinepath.ui similarity index 100% rename from src/dialogs/dialogsplinepath.ui rename to src/dialogs/tools/dialogsplinepath.ui diff --git a/src/dialogs/dialogtool.cpp b/src/dialogs/tools/dialogtool.cpp similarity index 99% rename from src/dialogs/dialogtool.cpp rename to src/dialogs/tools/dialogtool.cpp index 18f1cfdf5..1e721d7e5 100644 --- a/src/dialogs/dialogtool.cpp +++ b/src/dialogs/tools/dialogtool.cpp @@ -27,9 +27,9 @@ *************************************************************************/ #include "dialogtool.h" -#include "../container/calculator.h" -#include "../geometry/vgobject.h" -#include "../tools/vabstracttool.h" +#include "../../container/calculator.h" +#include "../../geometry/vgobject.h" +#include "../../tools/vabstracttool.h" #include diff --git a/src/dialogs/dialogtool.h b/src/dialogs/tools/dialogtool.h similarity index 99% rename from src/dialogs/dialogtool.h rename to src/dialogs/tools/dialogtool.h index ef8346c0d..613dcdbac 100644 --- a/src/dialogs/dialogtool.h +++ b/src/dialogs/tools/dialogtool.h @@ -35,7 +35,7 @@ #include #include #include -#include "../container/vcontainer.h" +#include "../../container/vcontainer.h" namespace ComboMode { diff --git a/src/dialogs/dialogtriangle.cpp b/src/dialogs/tools/dialogtriangle.cpp similarity index 100% rename from src/dialogs/dialogtriangle.cpp rename to src/dialogs/tools/dialogtriangle.cpp diff --git a/src/dialogs/dialogtriangle.h b/src/dialogs/tools/dialogtriangle.h similarity index 100% rename from src/dialogs/dialogtriangle.h rename to src/dialogs/tools/dialogtriangle.h diff --git a/src/dialogs/dialogtriangle.ui b/src/dialogs/tools/dialogtriangle.ui similarity index 100% rename from src/dialogs/dialogtriangle.ui rename to src/dialogs/tools/dialogtriangle.ui diff --git a/src/dialogs/dialoguniondetails.cpp b/src/dialogs/tools/dialoguniondetails.cpp similarity index 100% rename from src/dialogs/dialoguniondetails.cpp rename to src/dialogs/tools/dialoguniondetails.cpp diff --git a/src/dialogs/dialoguniondetails.h b/src/dialogs/tools/dialoguniondetails.h similarity index 100% rename from src/dialogs/dialoguniondetails.h rename to src/dialogs/tools/dialoguniondetails.h diff --git a/src/dialogs/dialoguniondetails.ui b/src/dialogs/tools/dialoguniondetails.ui similarity index 100% rename from src/dialogs/dialoguniondetails.ui rename to src/dialogs/tools/dialoguniondetails.ui diff --git a/src/tools/drawTools/vdrawtool.h b/src/tools/drawTools/vdrawtool.h index 3e24c9b59..4b5ec40e4 100644 --- a/src/tools/drawTools/vdrawtool.h +++ b/src/tools/drawTools/vdrawtool.h @@ -33,7 +33,7 @@ #include #include -#include "../../dialogs/dialogtool.h" +#include "../../dialogs/tools/dialogtool.h" /** * @brief The VDrawTool abstract class for all draw tool. diff --git a/src/tools/drawTools/vtoolalongline.cpp b/src/tools/drawTools/vtoolalongline.cpp index 1b75c1ed7..dbdc36561 100644 --- a/src/tools/drawTools/vtoolalongline.cpp +++ b/src/tools/drawTools/vtoolalongline.cpp @@ -28,7 +28,7 @@ #include "vtoolalongline.h" #include "../../container/calculator.h" -#include "../../dialogs/dialogalongline.h" +#include "../../dialogs/tools/dialogalongline.h" const QString VToolAlongLine::ToolType = QStringLiteral("alongLine"); diff --git a/src/tools/drawTools/vtoolarc.cpp b/src/tools/drawTools/vtoolarc.cpp index 1bfdc066b..c5c6b0aa1 100644 --- a/src/tools/drawTools/vtoolarc.cpp +++ b/src/tools/drawTools/vtoolarc.cpp @@ -28,7 +28,7 @@ #include "vtoolarc.h" #include "../../container/calculator.h" -#include "../../dialogs/dialogarc.h" +#include "../../dialogs/tools/dialogarc.h" const QString VToolArc::TagName = QStringLiteral("arc"); const QString VToolArc::ToolType = QStringLiteral("simple"); diff --git a/src/tools/drawTools/vtoolbisector.cpp b/src/tools/drawTools/vtoolbisector.cpp index 44b28bac6..ad169ae5b 100644 --- a/src/tools/drawTools/vtoolbisector.cpp +++ b/src/tools/drawTools/vtoolbisector.cpp @@ -28,7 +28,7 @@ #include "vtoolbisector.h" #include "../../container/calculator.h" -#include "../../dialogs/dialogbisector.h" +#include "../../dialogs/tools/dialogbisector.h" const QString VToolBisector::ToolType = QStringLiteral("bisector"); diff --git a/src/tools/drawTools/vtoolcutarc.cpp b/src/tools/drawTools/vtoolcutarc.cpp index bd75d9152..52772a577 100644 --- a/src/tools/drawTools/vtoolcutarc.cpp +++ b/src/tools/drawTools/vtoolcutarc.cpp @@ -28,7 +28,7 @@ #include "vtoolcutarc.h" #include "../../container/calculator.h" -#include "../../dialogs/dialogcutarc.h" +#include "../../dialogs/tools/dialogcutarc.h" const QString VToolCutArc::ToolType = QStringLiteral("cutArc"); const QString VToolCutArc::AttrArc = QStringLiteral("arc"); diff --git a/src/tools/drawTools/vtoolcutspline.cpp b/src/tools/drawTools/vtoolcutspline.cpp index efa9ca3c6..1783a4e19 100644 --- a/src/tools/drawTools/vtoolcutspline.cpp +++ b/src/tools/drawTools/vtoolcutspline.cpp @@ -28,7 +28,7 @@ #include "vtoolcutspline.h" #include "../../container/calculator.h" -#include "../../dialogs/dialogcutspline.h" +#include "../../dialogs/tools/dialogcutspline.h" const QString VToolCutSpline::ToolType = QStringLiteral("cutSpline"); const QString VToolCutSpline::AttrSpline = QStringLiteral("spline"); diff --git a/src/tools/drawTools/vtoolcutsplinepath.cpp b/src/tools/drawTools/vtoolcutsplinepath.cpp index ae49c70c7..0f401b42f 100644 --- a/src/tools/drawTools/vtoolcutsplinepath.cpp +++ b/src/tools/drawTools/vtoolcutsplinepath.cpp @@ -28,7 +28,7 @@ #include "vtoolcutsplinepath.h" #include "../../container/calculator.h" -#include "../../dialogs/dialogcutsplinepath.h" +#include "../../dialogs/tools/dialogcutsplinepath.h" const QString VToolCutSplinePath::ToolType = QStringLiteral("cutSplinePath"); const QString VToolCutSplinePath::AttrSplinePath = QStringLiteral("splinePath"); diff --git a/src/tools/drawTools/vtoolendline.cpp b/src/tools/drawTools/vtoolendline.cpp index efe9c6a9b..1f3d4d97c 100644 --- a/src/tools/drawTools/vtoolendline.cpp +++ b/src/tools/drawTools/vtoolendline.cpp @@ -29,7 +29,7 @@ #include "vtoolendline.h" #include "../../widgets/vmaingraphicsscene.h" #include "../../container/calculator.h" -#include "../../dialogs/dialogendline.h" +#include "../../dialogs/tools/dialogendline.h" const QString VToolEndLine::ToolType = QStringLiteral("endLine"); diff --git a/src/tools/drawTools/vtoolheight.cpp b/src/tools/drawTools/vtoolheight.cpp index 089218d64..d81505585 100644 --- a/src/tools/drawTools/vtoolheight.cpp +++ b/src/tools/drawTools/vtoolheight.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoolheight.h" -#include "../../dialogs/dialogheight.h" +#include "../../dialogs/tools/dialogheight.h" const QString VToolHeight::ToolType = QStringLiteral("height"); diff --git a/src/tools/drawTools/vtoolline.cpp b/src/tools/drawTools/vtoolline.cpp index c9fece4ca..47cb56a2a 100644 --- a/src/tools/drawTools/vtoolline.cpp +++ b/src/tools/drawTools/vtoolline.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoolline.h" -#include "../../dialogs/dialogline.h" +#include "../../dialogs/tools/dialogline.h" const QString VToolLine::TagName = QStringLiteral("line"); diff --git a/src/tools/drawTools/vtoolline.h b/src/tools/drawTools/vtoolline.h index 169cc77f0..1b8534c5c 100644 --- a/src/tools/drawTools/vtoolline.h +++ b/src/tools/drawTools/vtoolline.h @@ -31,7 +31,7 @@ #include "vdrawtool.h" #include -#include "../../dialogs/dialogline.h" +#include "../../dialogs/tools/dialogline.h" /** * @brief The VToolLine class tool for creation line. diff --git a/src/tools/drawTools/vtoollineintersect.cpp b/src/tools/drawTools/vtoollineintersect.cpp index a947d08ef..716b19386 100644 --- a/src/tools/drawTools/vtoollineintersect.cpp +++ b/src/tools/drawTools/vtoollineintersect.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoollineintersect.h" -#include "../../dialogs/dialoglineintersect.h" +#include "../../dialogs/tools/dialoglineintersect.h" const QString VToolLineIntersect::ToolType = QStringLiteral("lineIntersect"); diff --git a/src/tools/drawTools/vtoolnormal.cpp b/src/tools/drawTools/vtoolnormal.cpp index 38b84591e..af31122f0 100644 --- a/src/tools/drawTools/vtoolnormal.cpp +++ b/src/tools/drawTools/vtoolnormal.cpp @@ -28,7 +28,7 @@ #include "vtoolnormal.h" #include "../../container/calculator.h" -#include "../../dialogs/dialognormal.h" +#include "../../dialogs/tools/dialognormal.h" const QString VToolNormal::ToolType = QStringLiteral("normal"); diff --git a/src/tools/drawTools/vtoolpointofcontact.cpp b/src/tools/drawTools/vtoolpointofcontact.cpp index 3516678a3..5fe5dba03 100644 --- a/src/tools/drawTools/vtoolpointofcontact.cpp +++ b/src/tools/drawTools/vtoolpointofcontact.cpp @@ -28,7 +28,7 @@ #include "vtoolpointofcontact.h" #include "../../container/calculator.h" -#include "../../dialogs/dialogpointofcontact.h" +#include "../../dialogs/tools/dialogpointofcontact.h" const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact"); diff --git a/src/tools/drawTools/vtoolpointofintersection.cpp b/src/tools/drawTools/vtoolpointofintersection.cpp index c9e84e23e..7f374a654 100644 --- a/src/tools/drawTools/vtoolpointofintersection.cpp +++ b/src/tools/drawTools/vtoolpointofintersection.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoolpointofintersection.h" -#include "../../dialogs/dialogpointofintersection.h" +#include "../../dialogs/tools/dialogpointofintersection.h" const QString VToolPointOfIntersection::ToolType = QStringLiteral("pointOfIntersection"); diff --git a/src/tools/drawTools/vtoolshoulderpoint.cpp b/src/tools/drawTools/vtoolshoulderpoint.cpp index 9de69427e..98ca0ce68 100644 --- a/src/tools/drawTools/vtoolshoulderpoint.cpp +++ b/src/tools/drawTools/vtoolshoulderpoint.cpp @@ -28,7 +28,7 @@ #include "vtoolshoulderpoint.h" #include "../../container/calculator.h" -#include "../../dialogs/dialogshoulderpoint.h" +#include "../../dialogs/tools/dialogshoulderpoint.h" const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder"); diff --git a/src/tools/drawTools/vtoolsinglepoint.cpp b/src/tools/drawTools/vtoolsinglepoint.cpp index e56d7c3f8..38922455b 100644 --- a/src/tools/drawTools/vtoolsinglepoint.cpp +++ b/src/tools/drawTools/vtoolsinglepoint.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoolsinglepoint.h" -#include "../../dialogs/dialogsinglepoint.h" +#include "../../dialogs/tools/dialogsinglepoint.h" const QString VToolSinglePoint::ToolType = QStringLiteral("single"); diff --git a/src/tools/drawTools/vtoolspline.cpp b/src/tools/drawTools/vtoolspline.cpp index a8392d7ca..02760da64 100644 --- a/src/tools/drawTools/vtoolspline.cpp +++ b/src/tools/drawTools/vtoolspline.cpp @@ -28,7 +28,7 @@ #include "vtoolspline.h" #include "../../geometry/vspline.h" -#include "../../dialogs/dialogspline.h" +#include "../../dialogs/tools/dialogspline.h" const QString VToolSpline::TagName = QStringLiteral("spline"); const QString VToolSpline::ToolType = QStringLiteral("simple"); diff --git a/src/tools/drawTools/vtoolsplinepath.cpp b/src/tools/drawTools/vtoolsplinepath.cpp index d7f2dac6b..4316905f5 100644 --- a/src/tools/drawTools/vtoolsplinepath.cpp +++ b/src/tools/drawTools/vtoolsplinepath.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoolsplinepath.h" -#include "../../dialogs/dialogsplinepath.h" +#include "../../dialogs/tools/dialogsplinepath.h" const QString VToolSplinePath::TagName = QStringLiteral("spline"); const QString VToolSplinePath::ToolType = QStringLiteral("path"); diff --git a/src/tools/drawTools/vtooltriangle.cpp b/src/tools/drawTools/vtooltriangle.cpp index b980b8d8d..c0be5dd83 100644 --- a/src/tools/drawTools/vtooltriangle.cpp +++ b/src/tools/drawTools/vtooltriangle.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtooltriangle.h" -#include "../../dialogs/dialogtriangle.h" +#include "../../dialogs/tools/dialogtriangle.h" const QString VToolTriangle::ToolType = QStringLiteral("triangle"); diff --git a/src/tools/vtooldetail.h b/src/tools/vtooldetail.h index 2ae074f72..c600aeb96 100644 --- a/src/tools/vtooldetail.h +++ b/src/tools/vtooldetail.h @@ -31,7 +31,7 @@ #include "vabstracttool.h" #include -#include "../dialogs/dialogdetail.h" +#include "../dialogs/tools/dialogdetail.h" /** * @brief The VToolDetail class for working with detail. diff --git a/src/tools/vtooluniondetails.h b/src/tools/vtooluniondetails.h index 98c4b3eac..5a7c68f8b 100644 --- a/src/tools/vtooluniondetails.h +++ b/src/tools/vtooluniondetails.h @@ -30,7 +30,7 @@ #define VTOOLUNIONDETAILS_H #include "vabstracttool.h" -#include "../dialogs/dialoguniondetails.h" +#include "../dialogs/tools/dialoguniondetails.h" /** * @brief The VToolUnionDetails class tool union details.