From 53502e3dd9ce371e7126ba955f02476e0c8724d1 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 1 Jul 2017 14:43:16 +0300 Subject: [PATCH] Refactoring. Remove code dependency. --HG-- branch : feature --- src/app/valentina/dialogs/dialogpreferences.h | 1 + src/app/valentina/dialogs/vwidgetgroups.cpp | 1 + src/libs/vtools/dialogs/support/dialogeditwrongformula.h | 1 + src/libs/vtools/dialogs/tools/dialoginsertnode.cpp | 1 + src/libs/vtools/visualization/line/operation/visoperation.h | 1 + src/libs/vtools/visualization/line/vistoolpin.cpp | 1 + .../vtools/visualization/line/vistoolpointfromarcandtangent.h | 2 ++ src/libs/vtools/visualization/path/vispiecepins.cpp | 1 + src/libs/vtools/visualization/visualization.h | 3 ++- 9 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/app/valentina/dialogs/dialogpreferences.h b/src/app/valentina/dialogs/dialogpreferences.h index 099fde45f..754324f72 100644 --- a/src/app/valentina/dialogs/dialogpreferences.h +++ b/src/app/valentina/dialogs/dialogpreferences.h @@ -40,6 +40,7 @@ class PreferencesConfigurationPage; class PreferencesPatternPage; class PreferencesPathPage; class QListWidgetItem; +class VPattern; class DialogPreferences : public QDialog { diff --git a/src/app/valentina/dialogs/vwidgetgroups.cpp b/src/app/valentina/dialogs/vwidgetgroups.cpp index c6c39332a..14d1971ea 100644 --- a/src/app/valentina/dialogs/vwidgetgroups.cpp +++ b/src/app/valentina/dialogs/vwidgetgroups.cpp @@ -30,6 +30,7 @@ #include "ui_vwidgetgroups.h" #include "../vtools/dialogs/tools/dialoggroup.h" #include "../vtools/undocommands/delgroup.h" +#include "../vpatterndb/vcontainer.h" #include diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h index 63b6e6455..957b9f49f 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h @@ -40,6 +40,7 @@ #include "../tools/dialogtool.h" template class QSharedPointer; +class VMeasurement; namespace Ui { diff --git a/src/libs/vtools/dialogs/tools/dialoginsertnode.cpp b/src/libs/vtools/dialogs/tools/dialoginsertnode.cpp index 8bfce9fc3..bd5d1f227 100644 --- a/src/libs/vtools/dialogs/tools/dialoginsertnode.cpp +++ b/src/libs/vtools/dialogs/tools/dialoginsertnode.cpp @@ -28,6 +28,7 @@ #include "dialoginsertnode.h" #include "ui_dialoginsertnode.h" +#include "../vpatterndb/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- DialogInsertNode::DialogInsertNode(const VContainer *data, quint32 toolId, QWidget *parent) diff --git a/src/libs/vtools/visualization/line/operation/visoperation.h b/src/libs/vtools/visualization/line/operation/visoperation.h index 83ffbb06e..491bb69be 100644 --- a/src/libs/vtools/visualization/line/operation/visoperation.h +++ b/src/libs/vtools/visualization/line/operation/visoperation.h @@ -32,6 +32,7 @@ #include #include "../visline.h" +#include "../vpatterndb/vcontainer.h" class VisOperation : public VisLine { diff --git a/src/libs/vtools/visualization/line/vistoolpin.cpp b/src/libs/vtools/visualization/line/vistoolpin.cpp index 369a0d60f..3da8f48e7 100644 --- a/src/libs/vtools/visualization/line/vistoolpin.cpp +++ b/src/libs/vtools/visualization/line/vistoolpin.cpp @@ -29,6 +29,7 @@ #include "vistoolpin.h" #include "../vwidgets/vsimplepoint.h" #include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- VisToolPin::VisToolPin(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h b/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h index afd5801df..d11aae3a8 100644 --- a/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h +++ b/src/libs/vtools/visualization/line/vistoolpointfromarcandtangent.h @@ -41,6 +41,8 @@ #include "../vmisc/def.h" #include "visline.h" +class VArc; + class VisToolPointFromArcAndTangent : public VisLine { Q_OBJECT diff --git a/src/libs/vtools/visualization/path/vispiecepins.cpp b/src/libs/vtools/visualization/path/vispiecepins.cpp index 0bc203128..d197e6f39 100644 --- a/src/libs/vtools/visualization/path/vispiecepins.cpp +++ b/src/libs/vtools/visualization/path/vispiecepins.cpp @@ -29,6 +29,7 @@ #include "vispiecepins.h" #include "../vwidgets/vsimplepoint.h" #include "../vgeometry/vpointf.h" +#include "../vpatterndb/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- VisPiecePins::VisPiecePins(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/visualization.h b/src/libs/vtools/visualization/visualization.h index db88ae295..523221735 100644 --- a/src/libs/vtools/visualization/visualization.h +++ b/src/libs/vtools/visualization/visualization.h @@ -37,15 +37,16 @@ #include "../vmisc/def.h" #include "../vmisc/logging.h" #include "../vmisc/vabstractapplication.h" -#include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" #include "../vwidgets/vcurvepathitem.h" #include "../vwidgets/global.h" +#include "../vgeometry/vabstractcurve.h" Q_DECLARE_LOGGING_CATEGORY(vVis) class VScaledEllipse; class VScaledLine; +class VContainer; enum class Mode : char {Creation, Show};