From 2921dbf2a3f9e807db2dc0c0f136befb5e600e95 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 30 May 2017 11:56:16 +0300 Subject: [PATCH] Move dialog Piece path. --HG-- branch : develop --- src/libs/vtools/dialogs/dialogs.pri | 6 +++--- src/libs/vtools/dialogs/tooldialogs.h | 2 +- .../vtools/dialogs/tools/{ => piece}/dialogpiecepath.cpp | 6 +++--- src/libs/vtools/dialogs/tools/{ => piece}/dialogpiecepath.h | 2 +- .../vtools/dialogs/tools/{ => piece}/dialogpiecepath.ui | 0 src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp | 2 +- src/libs/vtools/tools/nodeDetails/vtoolpiecepath.cpp | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) rename src/libs/vtools/dialogs/tools/{ => piece}/dialogpiecepath.cpp (99%) rename src/libs/vtools/dialogs/tools/{ => piece}/dialogpiecepath.h (99%) rename src/libs/vtools/dialogs/tools/{ => piece}/dialogpiecepath.ui (100%) diff --git a/src/libs/vtools/dialogs/dialogs.pri b/src/libs/vtools/dialogs/dialogs.pri index 39720163e..8678e3bfb 100644 --- a/src/libs/vtools/dialogs/dialogs.pri +++ b/src/libs/vtools/dialogs/dialogs.pri @@ -43,7 +43,7 @@ HEADERS += \ $$PWD/tools/dialogmove.h \ $$PWD/tools/dialogellipticalarc.h \ $$PWD/tools/piece/dialogseamallowance.h \ - $$PWD/tools/dialogpiecepath.h \ + $$PWD/tools/piece/dialogpiecepath.h \ $$PWD/tools/dialogpin.h \ $$PWD/tools/dialoginsertnode.h @@ -88,7 +88,7 @@ SOURCES += \ $$PWD/tools/dialogmove.cpp \ $$PWD/tools/dialogellipticalarc.cpp \ $$PWD/tools/piece/dialogseamallowance.cpp \ - $$PWD/tools/dialogpiecepath.cpp \ + $$PWD/tools/piece/dialogpiecepath.cpp \ $$PWD/tools/dialogpin.cpp \ $$PWD/tools/dialoginsertnode.cpp @@ -132,7 +132,7 @@ FORMS += \ $$PWD/tools/dialogmove.ui \ $$PWD/tools/dialogellipticalarc.ui \ $$PWD/tools/piece/dialogseamallowance.ui \ - $$PWD/tools/dialogpiecepath.ui \ + $$PWD/tools/piece/dialogpiecepath.ui \ $$PWD/tools/dialogpin.ui \ $$PWD/tools/piece/tabs/tabpaths.ui \ $$PWD/tools/piece/tabs/tablabels.ui \ diff --git a/src/libs/vtools/dialogs/tooldialogs.h b/src/libs/vtools/dialogs/tooldialogs.h index ed3b103f9..6fb4bc2d1 100644 --- a/src/libs/vtools/dialogs/tooldialogs.h +++ b/src/libs/vtools/dialogs/tooldialogs.h @@ -66,7 +66,7 @@ #include "tools/dialogflippingbyaxis.h" #include "tools/dialogmove.h" #include "tools/dialogellipticalarc.h" -#include "tools/dialogpiecepath.h" +#include "tools/piece/dialogpiecepath.h" #include "tools/dialogpin.h" #include "tools/dialoginsertnode.h" diff --git a/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp similarity index 99% rename from src/libs/vtools/dialogs/tools/dialogpiecepath.cpp rename to src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp index 8f8b0938e..4bfb422f1 100644 --- a/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp @@ -30,9 +30,9 @@ #include "ui_dialogpiecepath.h" #include "../vpatterndb/vpiecenode.h" #include "visualization/path/vistoolpiecepath.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 #include diff --git a/src/libs/vtools/dialogs/tools/dialogpiecepath.h b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.h similarity index 99% rename from src/libs/vtools/dialogs/tools/dialogpiecepath.h rename to src/libs/vtools/dialogs/tools/piece/dialogpiecepath.h index e6a2a4aa2..893aaa80f 100644 --- a/src/libs/vtools/dialogs/tools/dialogpiecepath.h +++ b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.h @@ -29,7 +29,7 @@ #ifndef DIALOGPIECEPATH_H #define DIALOGPIECEPATH_H -#include "dialogtool.h" +#include "../dialogtool.h" namespace Ui { diff --git a/src/libs/vtools/dialogs/tools/dialogpiecepath.ui b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.ui similarity index 100% rename from src/libs/vtools/dialogs/tools/dialogpiecepath.ui rename to src/libs/vtools/dialogs/tools/piece/dialogpiecepath.ui diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp index f05290240..aad326261 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp @@ -39,7 +39,7 @@ #include "../vpatterndb/calculator.h" #include "visualization/path/vistoolpiece.h" #include "visualization/path/vispiecepins.h" -#include "../dialogpiecepath.h" +#include "dialogpiecepath.h" #include "../../../undocommands/savepiecepathoptions.h" #include "../../support/dialogeditwrongformula.h" #include "../../../tools/vtoolseamallowance.h" diff --git a/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.cpp b/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.cpp index 732dc4abc..9615f1e12 100644 --- a/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.cpp +++ b/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoolpiecepath.h" -#include "../../dialogs/tools/dialogpiecepath.h" +#include "../../dialogs/tools/piece/dialogpiecepath.h" #include "../vpatterndb/vpiecepath.h" #include "../vpatterndb/vpiecenode.h" #include "../../undocommands/savepieceoptions.h"