From 14e19ced4bbcbaf16a49444296d2aec37eee581c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 24 Oct 2017 14:14:59 +0300 Subject: [PATCH] Refactoring. Move dialogs related to pieces. --HG-- branch : feature --- src/libs/vtools/dialogs/dialogs.pri | 18 +++++++++--------- src/libs/vtools/dialogs/tooldialogs.h | 6 +++--- .../tools/{ => piece}/dialoginsertnode.cpp | 0 .../tools/{ => piece}/dialoginsertnode.h | 2 +- .../tools/{ => piece}/dialoginsertnode.ui | 0 .../dialogs/tools/{ => piece}/dialogpin.cpp | 2 +- .../dialogs/tools/{ => piece}/dialogpin.h | 2 +- .../dialogs/tools/{ => piece}/dialogpin.ui | 0 .../tools/{ => piece}/dialogplacelabel.cpp | 6 +++--- .../tools/{ => piece}/dialogplacelabel.h | 2 +- .../tools/{ => piece}/dialogplacelabel.ui | 0 .../tools/piece/dialogseamallowance.cpp | 2 +- src/libs/vtools/tools/nodeDetails/vtoolpin.cpp | 2 +- .../tools/nodeDetails/vtoolplacelabel.cpp | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) rename src/libs/vtools/dialogs/tools/{ => piece}/dialoginsertnode.cpp (100%) rename src/libs/vtools/dialogs/tools/{ => piece}/dialoginsertnode.h (98%) rename src/libs/vtools/dialogs/tools/{ => piece}/dialoginsertnode.ui (100%) rename src/libs/vtools/dialogs/tools/{ => piece}/dialogpin.cpp (99%) rename src/libs/vtools/dialogs/tools/{ => piece}/dialogpin.h (98%) rename src/libs/vtools/dialogs/tools/{ => piece}/dialogpin.ui (100%) rename src/libs/vtools/dialogs/tools/{ => piece}/dialogplacelabel.cpp (99%) rename src/libs/vtools/dialogs/tools/{ => piece}/dialogplacelabel.h (99%) rename src/libs/vtools/dialogs/tools/{ => piece}/dialogplacelabel.ui (100%) diff --git a/src/libs/vtools/dialogs/dialogs.pri b/src/libs/vtools/dialogs/dialogs.pri index f72bb27df..9df554fc8 100644 --- a/src/libs/vtools/dialogs/dialogs.pri +++ b/src/libs/vtools/dialogs/dialogs.pri @@ -44,10 +44,10 @@ HEADERS += \ $$PWD/tools/dialogellipticalarc.h \ $$PWD/tools/piece/dialogseamallowance.h \ $$PWD/tools/piece/dialogpiecepath.h \ - $$PWD/tools/dialogpin.h \ - $$PWD/tools/dialoginsertnode.h \ + $$PWD/tools/piece/dialogpin.h \ + $$PWD/tools/piece/dialoginsertnode.h \ $$PWD/support/dialogeditlabel.h \ - $$PWD/tools/dialogplacelabel.h + $$PWD/tools/piece/dialogplacelabel.h SOURCES += \ $$PWD/tools/dialogalongline.cpp \ @@ -91,10 +91,10 @@ SOURCES += \ $$PWD/tools/dialogellipticalarc.cpp \ $$PWD/tools/piece/dialogseamallowance.cpp \ $$PWD/tools/piece/dialogpiecepath.cpp \ - $$PWD/tools/dialogpin.cpp \ - $$PWD/tools/dialoginsertnode.cpp \ + $$PWD/tools/piece/dialogpin.cpp \ + $$PWD/tools/piece/dialoginsertnode.cpp \ $$PWD/support/dialogeditlabel.cpp \ - $$PWD/tools/dialogplacelabel.cpp + $$PWD/tools/piece/dialogplacelabel.cpp FORMS += \ $$PWD/tools/dialogalongline.ui \ @@ -137,13 +137,13 @@ FORMS += \ $$PWD/tools/dialogellipticalarc.ui \ $$PWD/tools/piece/dialogseamallowance.ui \ $$PWD/tools/piece/dialogpiecepath.ui \ - $$PWD/tools/dialogpin.ui \ + $$PWD/tools/piece/dialogpin.ui \ $$PWD/tools/piece/tabs/tabpaths.ui \ $$PWD/tools/piece/tabs/tablabels.ui \ $$PWD/tools/piece/tabs/tabgrainline.ui \ $$PWD/tools/piece/tabs/tabpins.ui \ - $$PWD/tools/dialoginsertnode.ui \ + $$PWD/tools/piece/dialoginsertnode.ui \ $$PWD/tools/piece/tabs/tabpassmarks.ui \ $$PWD/support/dialogeditlabel.ui \ - $$PWD/tools/dialogplacelabel.ui \ + $$PWD/tools/piece/dialogplacelabel.ui \ $$PWD/tools/piece/tabs/tabplacelabels.ui diff --git a/src/libs/vtools/dialogs/tooldialogs.h b/src/libs/vtools/dialogs/tooldialogs.h index 4510ba950..0db5a3721 100644 --- a/src/libs/vtools/dialogs/tooldialogs.h +++ b/src/libs/vtools/dialogs/tooldialogs.h @@ -67,9 +67,9 @@ #include "tools/dialogmove.h" #include "tools/dialogellipticalarc.h" #include "tools/piece/dialogpiecepath.h" -#include "tools/dialogpin.h" -#include "tools/dialoginsertnode.h" -#include "tools/dialogplacelabel.h" +#include "tools/piece/dialogpin.h" +#include "tools/piece/dialoginsertnode.h" +#include "tools/piece/dialogplacelabel.h" #include "support/dialogeditwrongformula.h" #include "support/dialogundo.h" diff --git a/src/libs/vtools/dialogs/tools/dialoginsertnode.cpp b/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.cpp similarity index 100% rename from src/libs/vtools/dialogs/tools/dialoginsertnode.cpp rename to src/libs/vtools/dialogs/tools/piece/dialoginsertnode.cpp diff --git a/src/libs/vtools/dialogs/tools/dialoginsertnode.h b/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.h similarity index 98% rename from src/libs/vtools/dialogs/tools/dialoginsertnode.h rename to src/libs/vtools/dialogs/tools/piece/dialoginsertnode.h index 081c2471a..840582f5f 100644 --- a/src/libs/vtools/dialogs/tools/dialoginsertnode.h +++ b/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.h @@ -29,7 +29,7 @@ #ifndef DIALOGINSERTNODE_H #define DIALOGINSERTNODE_H -#include "dialogtool.h" +#include "../dialogtool.h" #include "../vpatterndb/vpiecenode.h" namespace Ui diff --git a/src/libs/vtools/dialogs/tools/dialoginsertnode.ui b/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.ui similarity index 100% rename from src/libs/vtools/dialogs/tools/dialoginsertnode.ui rename to src/libs/vtools/dialogs/tools/piece/dialoginsertnode.ui diff --git a/src/libs/vtools/dialogs/tools/dialogpin.cpp b/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp similarity index 99% rename from src/libs/vtools/dialogs/tools/dialogpin.cpp rename to src/libs/vtools/dialogs/tools/piece/dialogpin.cpp index e789ce607..6c7479ce9 100644 --- a/src/libs/vtools/dialogs/tools/dialogpin.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp @@ -29,7 +29,7 @@ #include "dialogpin.h" #include "ui_dialogpin.h" #include "visualization/line/vistoolspecialpoint.h" -#include "../../tools/vabstracttool.h" +#include "../../../tools/vabstracttool.h" //--------------------------------------------------------------------------------------------------------------------- DialogPin::DialogPin(const VContainer *data, quint32 toolId, QWidget *parent) diff --git a/src/libs/vtools/dialogs/tools/dialogpin.h b/src/libs/vtools/dialogs/tools/piece/dialogpin.h similarity index 98% rename from src/libs/vtools/dialogs/tools/dialogpin.h rename to src/libs/vtools/dialogs/tools/piece/dialogpin.h index c6488d0bd..80d57b434 100644 --- a/src/libs/vtools/dialogs/tools/dialogpin.h +++ b/src/libs/vtools/dialogs/tools/piece/dialogpin.h @@ -29,7 +29,7 @@ #ifndef DIALOGPIN_H #define DIALOGPIN_H -#include "dialogtool.h" +#include "../dialogtool.h" namespace Ui { diff --git a/src/libs/vtools/dialogs/tools/dialogpin.ui b/src/libs/vtools/dialogs/tools/piece/dialogpin.ui similarity index 100% rename from src/libs/vtools/dialogs/tools/dialogpin.ui rename to src/libs/vtools/dialogs/tools/piece/dialogpin.ui diff --git a/src/libs/vtools/dialogs/tools/dialogplacelabel.cpp b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp similarity index 99% rename from src/libs/vtools/dialogs/tools/dialogplacelabel.cpp rename to src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp index c0c331f33..717945bb8 100644 --- a/src/libs/vtools/dialogs/tools/dialogplacelabel.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp @@ -29,9 +29,9 @@ #include "ui_dialogplacelabel.h" #include "visualization/line/vistoolspecialpoint.h" -#include "../../tools/vabstracttool.h" -#include "../../tools/vtoolseamallowance.h" -#include "../support/dialogeditwrongformula.h" +#include "../../../tools/vabstracttool.h" +#include "../../../tools/vtoolseamallowance.h" +#include "../../support/dialogeditwrongformula.h" #include "../vgeometry/vplacelabelitem.h" #include diff --git a/src/libs/vtools/dialogs/tools/dialogplacelabel.h b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.h similarity index 99% rename from src/libs/vtools/dialogs/tools/dialogplacelabel.h rename to src/libs/vtools/dialogs/tools/piece/dialogplacelabel.h index 92e27971c..8346e2470 100644 --- a/src/libs/vtools/dialogs/tools/dialogplacelabel.h +++ b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.h @@ -28,7 +28,7 @@ #ifndef DIALOGPLACELABEL_H #define DIALOGPLACELABEL_H -#include "dialogtool.h" +#include "../dialogtool.h" namespace Ui { diff --git a/src/libs/vtools/dialogs/tools/dialogplacelabel.ui b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.ui similarity index 100% rename from src/libs/vtools/dialogs/tools/dialogplacelabel.ui rename to src/libs/vtools/dialogs/tools/piece/dialogplacelabel.ui diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp index 81a358c50..c7656f99f 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp @@ -41,7 +41,7 @@ #include "visualization/path/vistoolpiece.h" #include "visualization/path/vispiecespecialpoints.h" #include "dialogpiecepath.h" -#include "../dialogplacelabel.h" +#include "dialogplacelabel.h" #include "../../../undocommands/savepiecepathoptions.h" #include "../../../undocommands/saveplacelabeloptions.h" #include "../../support/dialogeditwrongformula.h" diff --git a/src/libs/vtools/tools/nodeDetails/vtoolpin.cpp b/src/libs/vtools/tools/nodeDetails/vtoolpin.cpp index 3c518c3b4..55cd6a1ad 100644 --- a/src/libs/vtools/tools/nodeDetails/vtoolpin.cpp +++ b/src/libs/vtools/tools/nodeDetails/vtoolpin.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoolpin.h" -#include "../../dialogs/tools/dialogpin.h" +#include "../../dialogs/tools/piece/dialogpin.h" #include "../../undocommands/savepieceoptions.h" #include "../vtoolseamallowance.h" #include "../vgeometry/vpointf.h" diff --git a/src/libs/vtools/tools/nodeDetails/vtoolplacelabel.cpp b/src/libs/vtools/tools/nodeDetails/vtoolplacelabel.cpp index 0e99b2235..6b597fcf5 100644 --- a/src/libs/vtools/tools/nodeDetails/vtoolplacelabel.cpp +++ b/src/libs/vtools/tools/nodeDetails/vtoolplacelabel.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoolplacelabel.h" -#include "../../dialogs/tools/dialogplacelabel.h" +#include "../../dialogs/tools/piece/dialogplacelabel.h" #include "../../undocommands/savepieceoptions.h" #include "../vtoolseamallowance.h" #include "../vgeometry/vpointf.h"