Use forward declaration.

--HG--
branch : feature

src/app/container/calculator.cpp

@@ -30,6 +30,7 @@
 #include <QDebug>
 #include <QSettings>
 #include "../widgets/vapplication.h"
+#include "vcontainer.h"
 
 using namespace qmu;
 

src/app/container/calculator.h

@@ -29,10 +29,10 @@
 #ifndef CALCULATOR_H
 #define CALCULATOR_H
 
-#include "vcontainer.h"
-
 #include "../../libs/qmuparser/qmuparser.h"
 
+class VContainer;
+
 /**
  * @brief The Calculator class for calculation formula.
  *

src/app/container/vcontainer.cpp

@@ -27,10 +27,10 @@
  *************************************************************************/
 
 #include "vcontainer.h"
-
 #include <QDebug>
-#include <QtAlgorithms>
 #include "../widgets/vapplication.h"
+#include "../geometry/varc.h"
+#include "../geometry/vsplinepath.h"
 
 quint32 VContainer::_id = 0;
 

src/app/container/vcontainer.h

@@ -31,10 +31,7 @@
 
 #include "vmeasurement.h"
 #include "vincrement.h"
-#include "../geometry/varc.h"
-#include "../geometry/vsplinepath.h"
 #include "../geometry/vdetail.h"
-#include "../widgets/vitem.h"
 #include "../geometry/vgobject.h"
 #include "../exception/vexceptionbadid.h"
 

src/app/dialogs/app/configdialog.h

@@ -30,11 +30,11 @@
 #define CONFIGDIALOG_H
 
 #include <QDialog>
-#include <QListWidget>
 #include "pages.h"
 
 class QListWidgetItem;
 class QStackedWidget;
+class QListWidget;
 
 class ConfigDialog : public QDialog
 {

src/app/dialogs/app/dialoghistory.cpp

@@ -29,14 +29,13 @@
 #include "dialoghistory.h"
 #include "ui_dialoghistory.h"
 #include "../../geometry/varc.h"
-#include "../../geometry/vspline.h"
 #include "../../geometry/vsplinepath.h"
+#include "../../geometry/vpointf.h"
 #include "../../tools/vabstracttool.h"
 #include "../../tools/drawTools/vtoolcutspline.h"
 #include "../../tools/drawTools/vtoolcutsplinepath.h"
 #include "../../tools/drawTools/vtoolcutarc.h"
-#include <QDebug>
-#include <QPushButton>
+#include "../../xml/vpattern.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/app/dialoghistory.h

@@ -30,7 +30,9 @@
 #define DIALOGHISTORY_H
 
 #include "../tools/dialogtool.h"
-#include "../../xml/vpattern.h"
+
+class VPattern;
+class VToolRecord;
 
 namespace Ui
 {

src/app/dialogs/app/dialogincrements.cpp

@@ -30,15 +30,13 @@
 #include "ui_dialogincrements.h"
 #include "../../widgets/doubledelegate.h"
 #include "../../widgets/textdelegate.h"
-#include "../../exception/vexception.h"
 #include "../../xml/vstandardmeasurements.h"
+#include "../../xml/vpattern.h"
+#include "../../xml/vindividualmeasurements.h"
 
-#include <QPushButton>
-#include <QFile>
 #include <QFileDialog>
 #include <QDir>
 #include <QMessageBox>
-#include <QCloseEvent>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/app/dialogincrements.h

@@ -30,8 +30,9 @@
 #define DIALOGINCREMENTS_H
 
 #include "../tools/dialogtool.h"
-#include "../../xml/vpattern.h"
-#include "../../xml/vindividualmeasurements.h"
+
+class VPattern;
+class VIndividualMeasurements;
 
 namespace Ui
 {

src/app/dialogs/app/dialogindividualmeasurements.cpp

@@ -28,13 +28,11 @@
 
 #include "dialogindividualmeasurements.h"
 #include "ui_dialogindividualmeasurements.h"
-#include <QButtonGroup>
 #include "../../xml/vindividualmeasurements.h"
-#include <QSettings>
 #include <QFileDialog>
 #include <QMessageBox>
 #include "../../widgets/vapplication.h"
-#include <QPushButton>
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogIndividualMeasurements::DialogIndividualMeasurements(VContainer *data, const QString &patternPieceName,

src/app/dialogs/app/dialogindividualmeasurements.h

@@ -30,7 +30,8 @@
 #define DIALOGINDIVIDUALMEASUREMENTS_H
 
 #include <QDialog>
-#include "../../container/vcontainer.h"
+
+class VContainer;
 
 namespace Ui
 {

src/app/dialogs/app/dialogpatternproperties.cpp

@@ -29,7 +29,7 @@
 #include "dialogpatternproperties.h"
 #include "ui_dialogpatternproperties.h"
 #include <QSettings>
-#include <QPushButton>
+#include "../../xml/vpattern.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogPatternProperties::DialogPatternProperties(VPattern *doc, QWidget *parent) :

src/app/dialogs/app/dialogpatternproperties.h

@@ -30,7 +30,8 @@
 #define DIALOGPATTERNPROPERTIES_H
 
 #include <QDialog>
-#include "../../xml/vpattern.h"
+
+class VPattern;
 
 namespace Ui
 {

src/app/dialogs/app/dialogstandardmeasurements.cpp

@@ -31,7 +31,7 @@
 #include <QDir>
 #include "../../xml/vstandardmeasurements.h"
 #include "../../widgets/vapplication.h"
-#include <QPushButton>
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogStandardMeasurements::DialogStandardMeasurements(VContainer *data, const QString &patternPieceName,

src/app/dialogs/app/dialogstandardmeasurements.h

@@ -30,7 +30,8 @@
 #define DIALOGSTANDARDMEASUREMENTS_H
 
 #include <QDialog>
-#include "../../container/vcontainer.h"
+
+class VContainer;
 
 namespace Ui
 {

src/app/dialogs/app/pages.cpp

@@ -29,6 +29,7 @@
 #include "pages.h"
 #include "../../options.h"
 #include "../../widgets/vapplication.h"
+#include "../../widgets/vmaingraphicsview.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 ConfigurationPage::ConfigurationPage(QWidget *parent):

src/app/dialogs/app/pages.h

@@ -29,7 +29,13 @@
 #ifndef PAGES_H
 #define PAGES_H
 
-#include <QtWidgets>
+#include <QObject>
+
+class QCheckBox;
+class QSpinBox;
+class QComboBox;
+class QGroupBox;
+class QLineEdit;
 
 class ConfigurationPage : public QWidget
 {

src/app/dialogs/tools/dialogarc.cpp

@@ -30,7 +30,9 @@
 #include "ui_dialogarc.h"
 
 #include <QPushButton>
-#include <QtWidgets>
+
+#include "../../geometry/vpointf.h"
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/tools/dialogbisector.cpp

@@ -29,7 +29,8 @@
 #include "dialogbisector.h"
 #include "ui_dialogbisector.h"
 
-#include <QPushButton>
+#include "../../geometry/vpointf.h"
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/tools/dialogcutarc.cpp

@@ -29,6 +29,9 @@
 #include "dialogcutarc.h"
 #include "ui_dialogcutarc.h"
 
+#include "../../geometry/varc.h"
+#include "../../container/vcontainer.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief DialogCutArc create dialog.

src/app/dialogs/tools/dialogcutspline.cpp

@@ -29,6 +29,9 @@
 #include "dialogcutspline.h"
 #include "ui_dialogcutspline.h"
 
+#include "../../geometry/vspline.h"
+#include "../../container/vcontainer.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief DialogCutSpline create dialog.

src/app/dialogs/tools/dialogcutsplinepath.cpp

@@ -29,6 +29,9 @@
 #include "dialogcutsplinepath.h"
 #include "ui_dialogcutsplinepath.h"
 
+#include "../../geometry/vsplinepath.h"
+#include "../../container/vcontainer.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief DialogCutSplinePath create dialog.

src/app/dialogs/tools/dialogdetail.cpp

@@ -28,9 +28,13 @@
 
 #include "dialogdetail.h"
 
-#include <QPushButton>
 #include <QDebug>
 
+#include "../../geometry/varc.h"
+#include "../../geometry/vpointf.h"
+#include "../../geometry/vsplinepath.h"
+#include "../../container/vcontainer.h"
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief DialogDetail create dialog

src/app/dialogs/tools/dialogdetail.h

@@ -31,6 +31,7 @@
 
 #include "ui_dialogdetail.h"
 #include "dialogtool.h"
+#include "../../geometry/vdetail.h"
 
 /**
  * @brief The DialogDetail class dialog for ToolDetai. Help create detail and edit option.

src/app/dialogs/tools/dialogeditwrongformula.cpp

@@ -29,8 +29,6 @@
 #include "dialogeditwrongformula.h"
 #include "ui_dialogeditwrongformula.h"
 
-#include <container/calculator.h>
-
 //---------------------------------------------------------------------------------------------------------------------
 DialogEditWrongFormula::DialogEditWrongFormula(const VContainer *data, QWidget *parent)
     :DialogTool(data, parent), ui(new Ui::DialogEditWrongFormula), formula(QString())

src/app/dialogs/tools/dialogendline.cpp

@@ -29,7 +29,8 @@
 #include "dialogendline.h"
 #include "ui_dialogendline.h"
 
-#include <QPushButton>
+#include "../../geometry/vpointf.h"
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/tools/dialogheight.cpp

@@ -29,7 +29,8 @@
 #include "dialogheight.h"
 #include "ui_dialogheight.h"
 
-#include <QPushButton>
+#include "../../geometry/vpointf.h"
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/tools/dialogline.cpp

@@ -29,7 +29,8 @@
 #include "dialogline.h"
 #include "ui_dialogline.h"
 
-#include <QPushButton>
+#include "../../geometry/vpointf.h"
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/tools/dialoglineintersect.cpp

@@ -29,7 +29,8 @@
 #include "dialoglineintersect.h"
 #include "ui_dialoglineintersect.h"
 
-#include <QPushButton>
+#include "../../geometry/vpointf.h"
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/tools/dialognormal.cpp

@@ -29,8 +29,6 @@
 #include "dialognormal.h"
 #include "ui_dialognormal.h"
 
-#include <QPushButton>
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief DialogNormal create dialog

src/app/dialogs/tools/dialogpointofcontact.cpp

@@ -28,7 +28,8 @@
 
 #include "dialogpointofcontact.h"
 
-#include <QPushButton>
+#include "../../geometry/vpointf.h"
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/tools/dialogpointofintersection.cpp

@@ -29,7 +29,8 @@
 #include "dialogpointofintersection.h"
 #include "ui_dialogpointofintersection.h"
 
-#include <QPushButton>
+#include "../../geometry/vpointf.h"
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/tools/dialogshoulderpoint.cpp

@@ -29,7 +29,8 @@
 #include "dialogshoulderpoint.h"
 #include "ui_dialogshoulderpoint.h"
 
-#include <QPushButton>
+#include "../../geometry/vpointf.h"
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/tools/dialogsinglepoint.cpp

@@ -29,8 +29,6 @@
 #include "dialogsinglepoint.h"
 #include "ui_dialogsinglepoint.h"
 
-#include <QPushButton>
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief DialogSinglePoint create dialog

src/app/dialogs/tools/dialogspline.cpp

@@ -29,7 +29,8 @@
 #include "dialogspline.h"
 #include "ui_dialogspline.h"
 
-#include <QPushButton>
+#include "../../geometry/vpointf.h"
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/tools/dialogsplinepath.cpp

@@ -29,8 +29,7 @@
 #include "dialogsplinepath.h"
 #include "ui_dialogsplinepath.h"
 #include "../../geometry/vsplinepoint.h"
-
-#include <QPushButton>
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/tools/dialogtool.cpp

@@ -28,10 +28,11 @@
 
 #include "dialogtool.h"
 #include "../../container/calculator.h"
-#include "../../geometry/vgobject.h"
+#include "../../container/vcontainer.h"
+#include "../../geometry/varc.h"
+#include "../../geometry/vpointf.h"
+#include "../../geometry/vsplinepath.h"
 #include "../../tools/vabstracttool.h"
-
-#include <QtWidgets>
 #include "../../../libs/qmuparser/qmuparsererror.h"
 
 //---------------------------------------------------------------------------------------------------------------------

src/app/dialogs/tools/dialogtool.h

@@ -29,17 +29,19 @@
 #ifndef DIALOGTOOL_H
 #define DIALOGTOOL_H
 
-#include <QComboBox>
 #include <QDialog>
-#include <QDoubleSpinBox>
-#include <QLabel>
-#include <QListWidgetItem>
-#include <QRadioButton>
 #include <QDialogButtonBox>
-#include <QPushButton>
-#include "../../container/vcontainer.h"
 #include "../../widgets/vapplication.h"
 
+class QDoubleSpinBox;
+class QLabel;
+class QRadioButton;
+class QComboBox;
+class QListWidgetItem;
+class QLineEdit;
+class QListWidget;
+class VContainer;
+
 namespace ComboMode
 {
     /**

src/app/dialogs/tools/dialogtriangle.cpp

@@ -28,8 +28,8 @@
 
 #include "dialogtriangle.h"
 #include "ui_dialogtriangle.h"
-
-#include <QPushButton>
+#include "../../geometry/vpointf.h"
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/tools/dialoguniondetails.cpp

@@ -28,6 +28,8 @@
 
 #include "dialoguniondetails.h"
 #include "ui_dialoguniondetails.h"
+#include "../../geometry/vdetail.h"
+#include "../../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/exception/vexception.cpp

@@ -28,10 +28,10 @@
 
 #include "vexception.h"
 #include <QMessageBox>
-#include <QSpacerItem>
-#include <QGridLayout>
 #include "../options.h"
-#include <QApplication>
+
+class QSpacerItem;
+class QGridLayout;
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/exception/vexception.h

@@ -32,8 +32,8 @@
 
 #include <QException>
 #include <QString>
-#include <QWidget>
-#include <QCoreApplication>
+
+class QWidget;
 
 /**
  * @brief The VException class parent for all exception. Could be use for abstract exception

src/app/exception/vexceptionemptyparameter.cpp

@@ -27,8 +27,7 @@
  *************************************************************************/
 
 #include "vexceptionemptyparameter.h"
-
-#include <QtWidgets>
+#include <QDomElement>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/exception/vexceptionemptyparameter.h

@@ -31,7 +31,7 @@
 
 #include "vexception.h"
 
-#include <QDomElement>
+class QDomElement;
 
 /**
  * @brief The VExceptionEmptyParameter class for exception empty parameter

src/app/exception/vexceptionobjecterror.cpp

@@ -28,6 +28,7 @@
 
 #include "vexceptionobjecterror.h"
 #include <QDebug>
+#include <QDomElement>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/exception/vexceptionobjecterror.h

@@ -31,7 +31,7 @@
 
 #include "vexception.h"
 
-#include <QDomElement>
+class QDomElement;
 
 /**
  * @brief The VExceptionObjectError class for exception object error

src/app/exception/vexceptionwrongid.cpp

@@ -28,6 +28,7 @@
 
 #include "vexceptionwrongid.h"
 #include <QDebug>
+#include <QDomElement>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/exception/vexceptionwrongid.h

@@ -31,7 +31,7 @@
 
 #include "vexception.h"
 
-#include <QDomElement>
+class QDomElement;
 
 /**
  * @brief The VExceptionWrongId class for exception wrong id

src/app/geometry/varc.cpp

@@ -27,12 +27,12 @@
  *************************************************************************/
 
 #include "varc.h"
-#include "vspline.h"
-#include "../exception/vexception.h"
 #include <QDebug>
-#include <QtMath>
 
-class QRectF;
+#ifdef Q_OS_WIN32
+#   include <QtMath> // for M_PI on Windows
+#endif /*Q_OS_WIN32*/
+
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/geometry/varc.h

@@ -30,11 +30,8 @@
 #define VARC_H
 
 #include "vgobject.h"
-#include <QCoreApplication>
-#include "../options.h"
 #include "vpointf.h"
-class QString;
-class QLineF;
+
 class QPainterPath;
 
 /**

src/app/geometry/vdetail.cpp

@@ -28,6 +28,7 @@
 
 #include "vdetail.h"
 #include <QDebug>
+#include <QString>
 
 //---------------------------------------------------------------------------------------------------------------------
 VDetail::VDetail()

src/app/geometry/vdetail.h

@@ -30,10 +30,10 @@
 #define VDETAIL_H
 
 #include "vnodedetail.h"
-
-#include <QString>
 #include <QVector>
 
+class QString;
+
 namespace Detail
 {
     /**

src/app/geometry/vequidistant.cpp

@@ -26,9 +26,15 @@
  **
  *************************************************************************/
 
+#include "varc.h"
 #include "vequidistant.h"
+#include "vpointf.h"
+#include "vspline.h"
+#include "vsplinepath.h"
 #include "../widgets/vapplication.h"
 #include <QDebug>
+#include <QPainterPath>
+#include "../container/vcontainer.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 QPainterPath VEquidistant::ContourPath(const quint32 &idDetail, const VContainer *data) const

src/app/geometry/vequidistant.h

@@ -29,8 +29,12 @@
 #ifndef VEQUIDISTANT_H
 #define VEQUIDISTANT_H
 
-#include <QPainterPath>
-#include "../container/vcontainer.h"
+#include "vdetail.h"
+
+class QPainterPath;
+class VContainer;
+class QPointF;
+class QLineF;
 
 /**
  * @brief The VEquidistant class calculate equidistant for detail.

src/app/geometry/vgobject.h

@@ -30,10 +30,6 @@
 #define VGOBJECT_H
 
 #include "../options.h"
-#include "../exception/vexception.h"
-#include <QCoreApplication>
-#include <QHash>
-
 
 namespace GObject
 {

src/app/geometry/vnodedetail.h

@@ -29,7 +29,6 @@
 #ifndef VNODEDETAIL_H
 #define VNODEDETAIL_H
 
-#include <QMetaType>
 #include "../options.h"
 
 namespace NodeDetail

src/app/geometry/vpointf.cpp

@@ -27,6 +27,8 @@
  *************************************************************************/
 
 #include "vpointf.h"
+#include <QPointF>
+#include <QString>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
@@ -78,3 +80,13 @@ QString VPointF::name() const
 {
     return _name;
 }
+
+//---------------------------------------------------------------------------------------------------------------------
+/**
+ * @brief toQPointF convert to QPointF
+ * @return QPointF point
+ */
+QPointF VPointF::toQPointF() const
+{
+    return QPointF(_x, _y);
+}

src/app/geometry/vpointf.h

@@ -29,11 +29,11 @@
 #ifndef VPOINTF_H
 #define VPOINTF_H
 
-#include <QPointF>
-#include <QString>
-#include "../options.h"
 #include "vgobject.h"
 
+class QPointF;
+class QString;
+
 /**
  * @brief The VPointF class keep data of point.
  */
@@ -111,16 +111,6 @@ inline void VPointF::setMy(qreal my)
     _my = my;
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief toQPointF convert to QPointF
- * @return QPointF point
- */
-inline QPointF VPointF::toQPointF() const
-{
-    return QPointF(_x, _y);
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief x return x coordinate

src/app/geometry/vspline.cpp

@@ -27,9 +27,11 @@
  *************************************************************************/
 
 #include "vspline.h"
-#include <cmath>
 #include <QDebug>
-#include <QtMath>
+
+#ifdef Q_OS_WIN32
+#   include <QtMath> // for M_PI on Windows
+#endif /*Q_OS_WIN32*/
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/geometry/vspline.h

@@ -32,11 +32,8 @@
 #include "vpointf.h"
 #include "vgobject.h"
 
-#include <QHash>
-#include <QLineF>
-#include <QPainterPath>
-
-class QString;
+class QLineF;
+class QPainterPath;
 
 #define M_2PI   6.28318530717958647692528676655900576
 
@@ -52,6 +49,7 @@ public:
              quint32 idObject = 0, Valentina::Draws mode = Valentina::Calculation);
     VSpline (VPointF p1, QPointF p2, QPointF p3, VPointF p4, qreal kCurve, quint32 idObject = 0,
              Valentina::Draws mode = Valentina::Calculation);
+    VSpline &operator=(const VSpline &spl);
     VPointF GetP1 () const;
     QPointF GetP2 () const;
     QPointF GetP3 () const;
@@ -72,7 +70,6 @@ public:
     // cppcheck-suppress unusedFunction
     static QVector<QPointF> SplinePoints(const QPointF &p1, const QPointF &p4, qreal angle1, qreal angle2, qreal kAsm1,
                                          qreal kAsm2, qreal kCurve);
-    VSpline         &operator=(const VSpline &spl);
 protected:
     static QVector<QPointF> GetPoints (const QPointF &p1, const QPointF &p2, const QPointF &p3, const QPointF &p4 );
 private:

src/app/geometry/vsplinepath.h

@@ -29,12 +29,9 @@
 #ifndef VSPLINEPATH_H
 #define VSPLINEPATH_H
 
-#include "vsplinepoint.h"
-#include "vpointf.h"
-#include "vspline.h"
 #include "vgobject.h"
-#include <QApplication>
-#include "../container/vcontainer.h"
+#include "vspline.h"
+#include "vsplinepoint.h"
 
 namespace SplinePoint
 {

src/app/geometry/vsplinepoint.h

@@ -29,7 +29,6 @@
 #ifndef VSPLINEPOINT_H
 #define VSPLINEPOINT_H
 
-#include <QMetaType>
 #include "vpointf.h"
 
 /**

src/app/mainwindow.cpp

@@ -36,6 +36,7 @@
 #include "exception/vexceptionwrongid.h"
 #include "version.h"
 #include "xml/vstandardmeasurements.h"
+#include "xml/vindividualmeasurements.h"
 #include "widgets/vapplication.h"
 
 #include <QInputDialog>

src/app/options.cpp

@@ -27,6 +27,7 @@
  *************************************************************************/
 
 #include "options.h"
+#include <QString>
 
 // Keep synchronize all names with initialization in VApllication class.
 //measurements

src/app/options.h

@@ -30,15 +30,14 @@
 #define OPTIONS_H
 
 #include <QFlags>
-#include <QString>
-#include <QMetaType>
-#include <QtGlobal>
 #include <csignal>
 
 #ifdef Q_OS_WIN32
-#include <Windows.h>
+#   include <Windows.h>
 #endif /*Q_OS_WIN32*/
 
+class QString;
+
 #define SceneSize 50000
 
 namespace Valentina

src/app/stable.h

@@ -35,6 +35,7 @@
 #endif
 
 /* Add C includes here */
+#include <csignal>
 
 #if defined __cplusplus
 /* Add C++ includes here */

src/app/tools/drawTools/vdrawtool.cpp

@@ -29,8 +29,8 @@
 #include "vdrawtool.h"
 
 #include <qmuparsererror.h>
-#include <dialogs/tools/dialogeditwrongformula.h>
-#include <container/calculator.h>
+#include "dialogs/tools/dialogeditwrongformula.h"
+#include "container/calculator.h"
 #include "../../xml/vundocommands.h"
 
 qreal VDrawTool::factor = 1;

src/app/tools/drawTools/vdrawtool.h

@@ -35,6 +35,8 @@
 #include <QGraphicsSceneContextMenuEvent>
 #include <QGraphicsView>
 #include "../../dialogs/tools/dialogtool.h"
+#include "../../widgets/vmaingraphicsscene.h"
+#include "../../xml/vpattern.h"
 
 /**
  * @brief The VDrawTool abstract class for all draw tool.

src/app/tools/drawTools/vtoolalongline.cpp

@@ -29,7 +29,7 @@
 #include "vtoolalongline.h"
 #include "../../container/calculator.h"
 #include "../../dialogs/tools/dialogalongline.h"
-
+#include "../../geometry/vpointf.h"
 #include "exception/vexceptionobjecterror.h"
 
 const QString VToolAlongLine::ToolType = QStringLiteral("alongLine");

src/app/tools/drawTools/vtoolarc.cpp

@@ -30,6 +30,7 @@
 #include "../../container/calculator.h"
 #include "../../dialogs/tools/dialogarc.h"
 #include <QKeyEvent>
+#include "../../geometry/varc.h"
 
 const QString VToolArc::TagName = QStringLiteral("arc");
 const QString VToolArc::ToolType = QStringLiteral("simple");

src/app/tools/drawTools/vtoolbisector.cpp

@@ -29,6 +29,7 @@
 #include "vtoolbisector.h"
 #include "../../container/calculator.h"
 #include "../../dialogs/tools/dialogbisector.h"
+#include "../../geometry/vpointf.h"
 
 const QString VToolBisector::ToolType = QStringLiteral("bisector");
 

src/app/tools/drawTools/vtoolcutarc.cpp

@@ -29,6 +29,8 @@
 #include "vtoolcutarc.h"
 #include "../../container/calculator.h"
 #include "../../dialogs/tools/dialogcutarc.h"
+#include "../../geometry/vpointf.h"
+#include "../../geometry/varc.h"
 
 const QString VToolCutArc::ToolType = QStringLiteral("cutArc");
 const QString VToolCutArc::AttrArc = QStringLiteral("arc");

src/app/tools/drawTools/vtoolcutspline.cpp

@@ -29,6 +29,9 @@
 #include "vtoolcutspline.h"
 #include "../../container/calculator.h"
 #include "../../dialogs/tools/dialogcutspline.h"
+#include "../../geometry/vpointf.h"
+
+#include <geometry/vspline.h>
 
 const QString VToolCutSpline::ToolType = QStringLiteral("cutSpline");
 const QString VToolCutSpline::AttrSpline = QStringLiteral("spline");

src/app/tools/drawTools/vtoolcutsplinepath.cpp

@@ -29,6 +29,9 @@
 #include "vtoolcutsplinepath.h"
 #include "../../container/calculator.h"
 #include "../../dialogs/tools/dialogcutsplinepath.h"
+#include "../../geometry/vpointf.h"
+
+#include "../../geometry/vsplinepath.h"
 
 const QString VToolCutSplinePath::ToolType = QStringLiteral("cutSplinePath");
 const QString VToolCutSplinePath::AttrSplinePath = QStringLiteral("splinePath");

src/app/tools/drawTools/vtoolendline.cpp

@@ -31,6 +31,7 @@
 #include "../../container/calculator.h"
 #include "../../dialogs/tools/dialogendline.h"
 #include "../../dialogs/tools/dialogeditwrongformula.h"
+#include "../../geometry/vpointf.h"
 
 const QString VToolEndLine::ToolType = QStringLiteral("endLine");
 

src/app/tools/drawTools/vtoolheight.cpp

@@ -28,6 +28,7 @@
 
 #include "vtoolheight.h"
 #include "../../dialogs/tools/dialogheight.h"
+#include "../../geometry/vpointf.h"
 
 const QString VToolHeight::ToolType = QStringLiteral("height");
 

src/app/tools/drawTools/vtoolline.cpp

@@ -29,6 +29,8 @@
 #include "vtoolline.h"
 #include "../../dialogs/tools/dialogline.h"
 #include <QKeyEvent>
+#include "../../geometry/vpointf.h"
+#include "../../dialogs/tools/dialogline.h"
 
 const QString VToolLine::TagName = QStringLiteral("line");
 

src/app/tools/drawTools/vtoolline.h

@@ -31,7 +31,6 @@
 
 #include "vdrawtool.h"
 #include <QGraphicsLineItem>
-#include "../../dialogs/tools/dialogline.h"
 
 /**
  * @brief The VToolLine class tool for creation line.

src/app/tools/drawTools/vtoollineintersect.cpp

@@ -28,6 +28,7 @@
 
 #include "vtoollineintersect.h"
 #include "../../dialogs/tools/dialoglineintersect.h"
+#include "../../geometry/vpointf.h"
 
 const QString VToolLineIntersect::ToolType = QStringLiteral("lineIntersect");
 

src/app/tools/drawTools/vtoollinepoint.cpp

@@ -27,6 +27,7 @@
  *************************************************************************/
 
 #include "vtoollinepoint.h"
+#include "../../geometry/vpointf.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VToolLinePoint::VToolLinePoint(VPattern *doc, VContainer *data, const quint32 &id,

src/app/tools/drawTools/vtoolnormal.cpp

@@ -29,6 +29,7 @@
 #include "vtoolnormal.h"
 #include "../../container/calculator.h"
 #include "../../dialogs/tools/dialognormal.h"
+#include "../../geometry/vpointf.h"
 
 const QString VToolNormal::ToolType = QStringLiteral("normal");
 

src/app/tools/drawTools/vtoolpoint.cpp

@@ -28,6 +28,8 @@
 
 #include "vtoolpoint.h"
 #include <QKeyEvent>
+#include "../../geometry/vpointf.h"
+#include "../../widgets/vgraphicssimpletextitem.h"
 
 const QString VToolPoint::TagName = QStringLiteral("point");
 

src/app/tools/drawTools/vtoolpoint.h

@@ -30,7 +30,9 @@
 #define VTOOLPOINT_H
 
 #include "vdrawtool.h"
-#include "../../widgets/vgraphicssimpletextitem.h"
+
+class VPointF;
+class VGraphicsSimpleTextItem;
 
 /**
  * @brief The VToolPoint class parent for all tools what create points.

src/app/tools/drawTools/vtoolpointofcontact.cpp

@@ -29,6 +29,7 @@
 #include "vtoolpointofcontact.h"
 #include "../../container/calculator.h"
 #include "../../dialogs/tools/dialogpointofcontact.h"
+#include "../../geometry/vpointf.h"
 
 const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact");
 

src/app/tools/drawTools/vtoolpointofintersection.cpp

@@ -28,6 +28,7 @@
 
 #include "vtoolpointofintersection.h"
 #include "../../dialogs/tools/dialogpointofintersection.h"
+#include "../../geometry/vpointf.h"
 
 const QString VToolPointOfIntersection::ToolType = QStringLiteral("pointOfIntersection");
 

src/app/tools/drawTools/vtoolshoulderpoint.cpp

@@ -29,6 +29,7 @@
 #include "vtoolshoulderpoint.h"
 #include "../../container/calculator.h"
 #include "../../dialogs/tools/dialogshoulderpoint.h"
+#include "../../geometry/vpointf.h"
 
 const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder");
 

src/app/tools/drawTools/vtoolsinglepoint.cpp

@@ -28,8 +28,9 @@
 
 #include "vtoolsinglepoint.h"
 #include "../../dialogs/tools/dialogsinglepoint.h"
-
-#include <xml/vundocommands.h>
+#include "../../widgets/vgraphicssimpletextitem.h"
+#include "../../xml/vundocommands.h"
+#include "../../geometry/vpointf.h"
 
 const QString VToolSinglePoint::ToolType = QStringLiteral("single");
 

src/app/tools/drawTools/vtoolspline.h

@@ -30,7 +30,6 @@
 #define VTOOLSPLINE_H
 
 #include "vabstractspline.h"
-#include "../../geometry/vsplinepath.h"
 
 /**
  * @brief The VToolSpline class tool for creation spline. I mean bezier curve.

src/app/tools/drawTools/vtooltriangle.cpp

@@ -28,6 +28,7 @@
 
 #include "vtooltriangle.h"
 #include "../../dialogs/tools/dialogtriangle.h"
+#include "../../geometry/vpointf.h"
 
 const QString VToolTriangle::ToolType = QStringLiteral("triangle");
 

src/app/tools/nodeDetails/vabstractnode.cpp

@@ -28,6 +28,7 @@
 
 #include "vabstractnode.h"
 #include <QDebug>
+#include "../../xml/vpattern.h"
 
 const QString VAbstractNode::AttrIdObject = QStringLiteral("idObject");
 const QString VAbstractNode::AttrIdTool = QStringLiteral("idTool");

src/app/tools/nodeDetails/vnodearc.cpp

@@ -28,8 +28,8 @@
 
 #include "vnodearc.h"
 
-#include <QtWidgets>
 #include "../../widgets/vapplication.h"
+#include "../../geometry/varc.h"
 
 const QString VNodeArc::TagName = QStringLiteral("arc");
 const QString VNodeArc::ToolType = QStringLiteral("modeling");

src/app/tools/nodeDetails/vnodearc.h

@@ -31,6 +31,7 @@
 
 #include "vabstractnode.h"
 #include <QGraphicsPathItem>
+#include "../../xml/vpattern.h"
 
 /**
  * @brief The VNodeArc class arc detail node.

src/app/tools/nodeDetails/vnodepoint.cpp

@@ -28,8 +28,9 @@
 
 #include "vnodepoint.h"
 
-#include <QtWidgets>
 #include "../../widgets/vapplication.h"
+#include "../../geometry/vpointf.h"
+#include "../../widgets/vgraphicssimpletextitem.h"
 
 const QString VNodePoint::TagName = QStringLiteral("point");
 const QString VNodePoint::ToolType = QStringLiteral("modeling");

src/app/tools/nodeDetails/vnodepoint.h

@@ -30,7 +30,10 @@
 #define VNODEPOINT_H
 
 #include "vabstractnode.h"
-#include "../../widgets/vgraphicssimpletextitem.h"
+#include "../../xml/vpattern.h"
+
+class VPointF;
+class VGraphicsSimpleTextItem;
 
 /**
  * @brief The VNodePoint class point detail node.

src/app/tools/nodeDetails/vnodespline.cpp

@@ -28,8 +28,8 @@
 
 #include "vnodespline.h"
 
-#include <QtWidgets>
 #include "../../widgets/vapplication.h"
+#include "../../geometry/vspline.h"
 
 const QString VNodeSpline::TagName = QStringLiteral("spline");
 const QString VNodeSpline::ToolType = QStringLiteral("modelingSpline");

src/app/tools/nodeDetails/vnodespline.h

@@ -31,6 +31,7 @@
 
 #include "vabstractnode.h"
 #include <QGraphicsPathItem>
+#include "../../xml/vpattern.h"
 
 /**
  * @brief The VNodeSpline class spline detail node.

src/app/tools/nodeDetails/vnodesplinepath.cpp

@@ -28,8 +28,8 @@
 
 #include "vnodesplinepath.h"
 
-#include <QtWidgets>
 #include "../../widgets/vapplication.h"
+#include "../../geometry/vsplinepath.h"
 
 const QString VNodeSplinePath::TagName = QStringLiteral("spline");
 const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath");

src/app/tools/nodeDetails/vnodesplinepath.h

@@ -31,6 +31,7 @@
 
 #include "vabstractnode.h"
 #include <QGraphicsPathItem>
+#include "../../xml/vpattern.h"
 
 /**
  * @brief The VNodeSplinePath class spline path detail node.

src/app/tools/vabstracttool.cpp

@@ -27,6 +27,7 @@
  *************************************************************************/
 
 #include "vabstracttool.h"
+#include "../xml/vpattern.h"
 #include <QGraphicsView>
 
 const QString VAbstractTool::AttrType        = QStringLiteral("type");

src/app/tools/vabstracttool.h

@@ -30,8 +30,8 @@
 #define VABSTRACTTOOL_H
 
 #include "vdatatool.h"
-#include "../xml/vpattern.h"
-#include <QMessageBox>
+
+class VPattern;
 
 /**
  * @brief The VAbstractTool abstract class for all tools.