Refactoring.

Optimize includes.

src/libs/ifc/ifcdef.cpp

@@ -38,7 +38,9 @@
 #include <QStringData>
 #include <QStringDataPtr>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 const QString CustomMSign    = QStringLiteral("@");
 const QString CustomIncrSign = QStringLiteral("#");

src/libs/ifc/ifcdef.h

@@ -42,7 +42,9 @@
 
 #include "../vmisc/typedef.h"
 #include "../vmisc/def.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 extern const QString CustomMSign;
 extern const QString CustomIncrSign;

src/libs/ifc/xml/vdomdocument.h

@@ -46,7 +46,9 @@
 
 #include "../ifc/ifcdef.h"
 #include "../vmisc/def.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/literals.h"
 
 class QDomElement;

src/libs/qmuparser/qmuparsercallback_p.h

@@ -27,7 +27,9 @@
 
 #include <QSharedData>
 #include "qmuparserdef.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/defglobal.h"
 
 QT_WARNING_PUSH

src/libs/vdxf/libdxfrw/drw_entities.cpp

@@ -16,7 +16,9 @@
 #include "intern/dxfreader.h"
 #include "intern/drw_dbg.h"
 #include "drw_reserve.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 
 //! Calculate arbitrary axis

src/libs/vdxf/libdxfrw/libdxfrw.cpp

@@ -21,7 +21,9 @@
 #include "intern/dxfreader.h"
 #include "intern/dxfwriter.h"
 #include "intern/drw_dbg.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 #define FIRSTHANDLE 48
 

src/libs/vdxf/vdxfengine.cpp

@@ -47,7 +47,9 @@
 #include <QtDebug>
 
 #include "../vmisc/def.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/vmath.h"
 #include "dxiface.h"
 #include "../vlayout/vlayoutpiece.h"

src/libs/vformat/vpatternrecipe.cpp

@@ -28,7 +28,7 @@
 
 #include "vpatternrecipe.h"
 #include "../vmisc/projectversion.h"
-#include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vabstractvalapplication.h"
 #include "../ifc/xml/vabstractpattern.h"
 #include "../ifc/exception/vexceptioninvalidhistory.h"
 #include "../vpatterndb/vcontainer.h"
@@ -36,9 +36,43 @@
 #include "../vgeometry/vcubicbezier.h"
 #include "../vgeometry/vsplinepath.h"
 #include "../vgeometry/vcubicbezierpath.h"
-#include "../vtools/tools/drawTools/drawtools.h"
 #include "../vpatterndb/calculator.h"
 
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h"
+#include "../vtools/tools/drawTools/toolcurve/vtoolarc.h"
+#include "../vtools/tools/drawTools/toolcurve/vtoolellipticalarc.h"
+#include "../vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h"
+#include "../vtools/tools/drawTools/toolcurve/vtoolspline.h"
+#include "../vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h"
+#include "../vtools/tools/drawTools/toolcurve/vtoolsplinepath.h"
+#include "../vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h"
+#include "../vtools/tools/drawTools/vtoolline.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h"
+#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h"
+#include "../vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h"
+#include "../vtools/tools/drawTools/operation/vtoolrotation.h"
+#include "../vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h"
+#include "../vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h"
+#include "../vtools/tools/drawTools/operation/vtoolmove.h"
+
 namespace
 {
 #define TagStep QStringLiteral("step")

src/libs/vgeometry/vabstractarc_p.h

@@ -32,7 +32,9 @@
 #include <QSharedData>
 #include "vgeometrydef.h"
 #include "../vmisc/vabstractapplication.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "vpointf.h"
 
 QT_WARNING_PUSH

src/libs/vgeometry/vabstractcurve_p.h

@@ -32,7 +32,9 @@
 #include <QSharedData>
 
 #include "../ifc/ifcdef.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")

src/libs/vgeometry/varc_p.h

@@ -32,7 +32,9 @@
 #include <QSharedData>
 #include "vgeometrydef.h"
 #include "../vmisc/vabstractvalapplication.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")

src/libs/vgeometry/vcubicbezier_p.h

@@ -34,7 +34,9 @@
 
 #include "vpointf.h"
 #include "../vmisc/vabstractapplication.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/vmath.h"
 
 QT_WARNING_PUSH

src/libs/vgeometry/vcubicbezierpath_p.h

@@ -32,7 +32,9 @@
 #include <QSharedData>
 
 #include "vpointf.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")

src/libs/vgeometry/vellipticalarc_p.h

@@ -3,7 +3,9 @@
 
 #include <QSharedData>
 #include "../vmisc/vabstractvalapplication.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "vpointf.h"
 
 QT_WARNING_PUSH

src/libs/vgeometry/vgobject_p.h

@@ -32,7 +32,9 @@
 #include <QSharedData>
 #include "vgeometrydef.h"
 #include "../ifc/ifcdef.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")

src/libs/vgeometry/vplacelabelitem_p.h

@@ -31,7 +31,9 @@
 #include <QSharedData>
 #include "vgeometrydef.h"
 #include "../ifc/ifcdef.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")

src/libs/vgeometry/vpointf.h

@@ -36,7 +36,9 @@
 #include <QTypeInfo>
 #include <QtGlobal>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "vgeometrydef.h"
 #include "vgobject.h"
 

src/libs/vgeometry/vpointf_p.h

@@ -31,7 +31,9 @@
 
 #include <QSharedData>
 #include "vgeometrydef.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QPointF>
 
 QT_WARNING_PUSH

src/libs/vlayout/vabstractpiece_p.h

@@ -34,7 +34,9 @@
 #include <QCoreApplication>
 #include <QUuid>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 #   include "../vmisc/vdatastreamenum.h"
 #endif

src/libs/vlayout/vbestsquare_p.h

@@ -32,7 +32,9 @@
 #include <QTransform>
 
 #include "vlayoutdef.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/defglobal.h"
 
 QT_WARNING_PUSH

src/libs/vlayout/vcontour_p.h

@@ -35,7 +35,9 @@
 #include <QRectF>
 #include <QPainterPath>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/defglobal.h"
 
 QT_WARNING_PUSH

src/libs/vlayout/vlayoutpiece_p.h

@@ -37,7 +37,9 @@
 #include "../vpatterndb/floatItemData/vpiecelabeldata.h"
 #include "../vpatterndb/floatItemData/vpatternlabeldata.h"
 #include "../vpatterndb/floatItemData/vgrainlinedata.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 #   include "../vmisc/vdatastreamenum.h"
 #endif

src/libs/vlayout/vlayoutpiecepath_p.h

@@ -34,7 +34,9 @@
 #include <QVector>
 #include <QDataStream>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 #   include "../vmisc/vdatastreamenum.h"
 #endif

src/libs/vlayout/vrawsapoint.h

@@ -30,7 +30,9 @@
 
 #include <QPointF>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/def.h"
 
 QT_WARNING_PUSH

src/libs/vlayout/vsapoint.h

@@ -28,7 +28,9 @@
 #ifndef VSAPOINT_H
 #define VSAPOINT_H
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/def.h"
 #include "../ifc/ifcdef.h"
 

src/libs/vmisc/backport/qoverload.h

@@ -33,7 +33,9 @@
 #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
 #if defined(Q_COMPILER_VARIADIC_TEMPLATES)
 
-#include "../diagnostic.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
+#include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")

src/libs/vmisc/qxtcsvmodel.cpp

@@ -41,7 +41,9 @@
 #include <QTextStream>
 #include <Qt>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 class QxtCsvModelPrivate : public QxtPrivate<QxtCsvModel>
 {

src/libs/vmisc/vlockguard.h

@@ -38,7 +38,9 @@
 #include <QString>
 #include <stdint.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/defglobal.h"
 
 #include <QFileInfo>

src/libs/vobj/delaunay.cpp

@@ -23,7 +23,9 @@
 #include <string.h>
 #include <QtGlobal>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "delaunay.h"
 
 QT_WARNING_PUSH

src/libs/vobj/predicates.cpp

@@ -107,7 +107,9 @@
 
 #include <QtGlobal>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_MSVC(4701)

src/libs/vobj/vobjengine.cpp

@@ -43,7 +43,9 @@
 #include <QtDebug>
 #include <Qt>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/vmath.h"
 
 class QPaintDevice;

src/libs/vpatterndb/variables/vincrement_p.h

@@ -33,7 +33,9 @@
 
 #include "../ifc/ifcdef.h"
 #include "../vcontainer.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")

src/libs/vpatterndb/variables/vmeasurement_p.h

@@ -32,7 +32,9 @@
 #include <QSharedData>
 
 #include "../vcontainer.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")

src/libs/vpatterndb/vcontainer.h

@@ -50,7 +50,9 @@
 #include "../vgeometry/vabstractcubicbezierpath.h"
 #include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/vgobject.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "variables.h"
 #include "variables/vinternalvariable.h"
 #include "vpiece.h"

src/libs/vpatterndb/vformula_p.h

@@ -28,7 +28,9 @@
 #ifndef VFORMULA_P_H
 #define VFORMULA_P_H
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/typedef.h"
 #include "../vmisc/vmath.h"
 #include "../vmisc/defglobal.h"

src/libs/vpatterndb/vnodedetail_p.h

@@ -31,7 +31,9 @@
 
 #include <QSharedData>
 #include "../ifc/ifcdef.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")

src/libs/vpatterndb/vpiece_p.h

@@ -32,7 +32,9 @@
 #include <QSharedData>
 #include <QVector>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/def.h"
 #include "vpiecenode.h"
 #include "vpiecepath.h"

src/libs/vpatterndb/vpiecenode_p.h

@@ -35,7 +35,9 @@
 
 #include "../ifc/ifcdef.h"
 #include "../ifc/exception/vexception.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 #   include "../vmisc/vdatastreamenum.h"
 #endif

src/libs/vpatterndb/vpiecepath_p.h

@@ -32,7 +32,9 @@
 #include <QSharedData>
 #include <QVector>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "vpiecenode.h"
 
 QT_WARNING_PUSH

src/libs/vpropertyexplorer/vabstractpropertyfactory.h

@@ -22,7 +22,9 @@
 #define VABSTRACTPROPERTYFACTORY_H
 
 #include "vpropertyexplorer_global.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include <QObject>
 
 namespace VPE

src/libs/vpropertyexplorer/vpropertyformview_p.h

@@ -24,7 +24,9 @@
 // ONLY INCLUDE THIS IN .CPP FILES
 
 #include "vpropertyformwidget_p.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 namespace VPE
 {

src/libs/vpropertyexplorer/vpropertyformwidget_p.h

@@ -25,7 +25,9 @@
 
 #include <QList>
 #include "vproperty.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 namespace VPE
 {

src/libs/vpropertyexplorer/vwidgetproperty_p.h

@@ -24,7 +24,9 @@
 // ONLY INCLUDE THIS IN .CPP FILES
 
 #include "vproperty_p.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
 #include <QPointer>
 #include <QWidget>

src/libs/vtools/dialogs/tools/dialogarc.cpp

@@ -49,6 +49,7 @@
 #include "../vgeometry/varc.h"
 #include "../qmuparser/qmudef.h"
 #include "../vwidgets/vabstractmainwindow.h"
+#include "../vwidgets/global.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp

@@ -38,7 +38,6 @@
 #include <QToolButton>
 #include <Qt>
 
-#include "../ifc/xml/vdomdocument.h"
 #include "../vpatterndb/vtranslatevars.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../../visualization/path/vistoolarcwithlength.h"
@@ -50,6 +49,7 @@
 #include "../vgeometry/varc.h"
 #include "../qmuparser/qmudef.h"
 #include "../vwidgets/vabstractmainwindow.h"
+#include "../vwidgets/global.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogArcWithLength::DialogArcWithLength(const VContainer *data, quint32 toolId, QWidget *parent)

src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp

@@ -54,6 +54,7 @@
 #include "../qmuparser/qmudef.h"
 #include "../dialogtoolbox.h"
 #include "ui_dialogcurveintersectaxis.h"
+#include "../vwidgets/global.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, quint32 toolId, QWidget *parent)

src/libs/vtools/dialogs/tools/dialogendline.cpp

@@ -45,15 +45,14 @@
 #include "../vpatterndb/vtranslatevars.h"
 #include "../vwidgets/vmaingraphicsscene.h"
 #include "../vwidgets/vabstractmainwindow.h"
-#include "../../tools/vabstracttool.h"
 #include "../../visualization/line/vistoolendline.h"
 #include "../../visualization/visualization.h"
 #include "../ifc/xml/vabstractpattern.h"
-#include "../ifc/xml/vdomdocument.h"
 #include "../support/dialogeditwrongformula.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
 #include "ui_dialogendline.h"
+#include "../vwidgets/global.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp

@@ -49,7 +49,7 @@
 #include "../vpatterndb/vtranslatevars.h"
 #include "../vwidgets/vmaingraphicsscene.h"
 #include "../vwidgets/vabstractmainwindow.h"
-#include "../../tools/vabstracttool.h"
+#include "../vwidgets/global.h"
 #include "../../visualization/line/vistoollineintersectaxis.h"
 #include "../../visualization/visualization.h"
 #include "../ifc/xml/vabstractpattern.h"

src/libs/vtools/dialogs/tools/dialogrotation.cpp

@@ -57,7 +57,6 @@
 #include "../vgeometry/vpointf.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
-#include "../vmisc/compatibility.h"
 #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
 #include "../vmisc/backport/qoverload.h"
 #endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
@@ -66,6 +65,7 @@
 #include "../vwidgets/vabstractmainwindow.h"
 #include "../vwidgets/vmaingraphicsscene.h"
 #include "../vwidgets/vmaingraphicsview.h"
+#include "../vwidgets/global.h"
 #include "ui_dialogrotation.h"
 #include "../../tools/drawTools/operation/vabstractoperation.h"
 

src/libs/vtools/tools/drawTools/drawtools.h

@@ -1,67 +0,0 @@
-/************************************************************************
- **
- **  @file   drawtools.h
- **  @author Roman Telezhynskyi <dismine(at)gmail.com>
- **  @date   November 15, 2013
- **
- **  @brief
- **  @copyright
- **  This source code is part of the Valentina project, a pattern making
- **  program, whose allow create and modeling patterns of clothing.
- **  Copyright (C) 2013-2015 Valentina project
- **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
- **
- **  Valentina is free software: you can redistribute it and/or modify
- **  it under the terms of the GNU General Public License as published by
- **  the Free Software Foundation, either version 3 of the License, or
- **  (at your option) any later version.
- **
- **  Valentina is distributed in the hope that it will be useful,
- **  but WITHOUT ANY WARRANTY; without even the implied warranty of
- **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- **  GNU General Public License for more details.
- **
- **  You should have received a copy of the GNU General Public License
- **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
- **
- *************************************************************************/
-
-#ifndef DRAWTOOLS_H
-#define DRAWTOOLS_H
-
-#include "toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h"
-#include "toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h"
-#include "toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h"
-#include "toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h"
-#include "toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h"
-#include "toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h"
-#include "toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h"
-#include "toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h"
-#include "toolcurve/vtoolarc.h"
-#include "toolcurve/vtoolellipticalarc.h"
-#include "toolcurve/vtoolarcwithlength.h"
-#include "toolcurve/vtoolspline.h"
-#include "toolcurve/vtoolcubicbezier.h"
-#include "toolcurve/vtoolsplinepath.h"
-#include "toolcurve/vtoolcubicbezierpath.h"
-#include "vtoolline.h"
-#include "toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h"
-#include "toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h"
-#include "toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h"
-#include "toolpoint/toolsinglepoint/vtoollineintersect.h"
-#include "toolpoint/toolsinglepoint/vtoolpointofcontact.h"
-#include "toolpoint/toolsinglepoint/vtoolbasepoint.h"
-#include "toolpoint/toolsinglepoint/vtooltriangle.h"
-#include "toolpoint/toolsinglepoint/vtoolpointofintersection.h"
-#include "toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h"
-#include "toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h"
-#include "toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h"
-#include "toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h"
-#include "toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h"
-#include "toolpoint/tooldoublepoint/vtooltruedarts.h"
-#include "operation/vtoolrotation.h"
-#include "operation/flipping/vtoolflippingbyline.h"
-#include "operation/flipping/vtoolflippingbyaxis.h"
-#include "operation/vtoolmove.h"
-
-#endif // DRAWTOOLS_H

src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp

@@ -50,7 +50,9 @@
 #include "../vpatterndb/vtranslatevars.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/vformula.h"
 #include "../ifc/ifcdef.h"

src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp

@@ -50,7 +50,9 @@
 #include "../vpatterndb/vtranslatevars.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/vformula.h"
 #include "../ifc/ifcdef.h"

src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp

@@ -58,7 +58,9 @@
 #include "../vpatterndb/vtranslatevars.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/compatibility.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/vformula.h"

src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp

@@ -58,7 +58,9 @@
 #include "../vpatterndb/vtranslatevars.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/vformula.h"
 #include "../ifc/ifcdef.h"

src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp

@@ -50,6 +50,7 @@
 #include "../vgeometry/vabstractarc.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/vcontrolpointspline.h"
+#include "../vwidgets/global.h"
 #include "../../../visualization/line/visline.h"
 #include "../../vabstracttool.h"
 #include "../vdrawtool.h"

src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp

@@ -46,6 +46,7 @@
 #include <QVector>
 #include <Qt>
 #include <new>
+#include <QtMath>
 
 #include "../../../dialogs/tools/dialogspline.h"
 #include "../../../dialogs/tools/dialogtool.h"
@@ -59,10 +60,10 @@
 #include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"
 #include "../vmisc/vabstractapplication.h"
-#include "../vmisc/vmath.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/vcontrolpointspline.h"
 #include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/global.h"
 #include "../../vabstracttool.h"
 #include "../vdrawtool.h"
 #include "vabstractspline.h"

src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp

@@ -46,6 +46,7 @@
 #include <QUndoStack>
 #include <Qt>
 #include <new>
+#include <QtMath>
 
 #include "../../../dialogs/tools/dialogtool.h"
 #include "../../../dialogs/tools/dialogsplinepath.h"
@@ -64,11 +65,11 @@
 #include "../vgeometry/vspline.h"
 #include "../vgeometry/vsplinepoint.h"
 #include "../vmisc/vabstractapplication.h"
-#include "../vmisc/vmath.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/../vgeometry/vsplinepath.h"
 #include "../vwidgets/vcontrolpointspline.h"
 #include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/global.h"
 #include "../../vabstracttool.h"
 #include "../vdrawtool.h"
 #include "vabstractspline.h"

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp

@@ -43,12 +43,12 @@
 #include "../ifc/ifcdef.h"
 #include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"
-#include "../vmisc/vabstractapplication.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../../../../vabstracttool.h"
 #include "../../../vdrawtool.h"
 #include "../vtoolsinglepoint.h"
 #include "../vwidgets/scalesceneitems.h"
+#include "../vwidgets/global.h"
 
 template <class T> class QSharedPointer;
 

src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp

@@ -60,6 +60,7 @@
 #include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/vgraphicssimpletextitem.h"
 #include "../vwidgets/scalesceneitems.h"
+#include "../vwidgets/global.h"
 #include "../../../vabstracttool.h"
 #include "../../vdrawtool.h"
 #include "../vabstractpoint.h"

src/libs/vtools/tools/drawTools/vtoolline.cpp

@@ -46,9 +46,9 @@
 #include "../ifc/ifcdef.h"
 #include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"
-#include "../vmisc/vabstractapplication.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/global.h"
 #include "../vabstracttool.h"
 #include "vdrawtool.h"
 
@@ -68,7 +68,7 @@ VToolLine::VToolLine(const VToolLineInitData &initData, QGraphicsItem *parent)
       lineColor(initData.lineColor),
       m_acceptHoverEvents(true)
 {
-    m_isBoldLine = false;
+    SetBoldLine(false);
     this->m_lineType = initData.typeLine;
     //Line
     RefreshGeometry();
@@ -292,7 +292,7 @@ void VToolLine::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
     if (m_acceptHoverEvents)
     {
-        m_isBoldLine = true;
+        SetBoldLine(true);
         setToolTip(MakeToolTip());
         VScaledLine::hoverEnterEvent(event);
     }
@@ -311,7 +311,7 @@ void VToolLine::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
     if (m_acceptHoverEvents && vis.isNull())
     {
-        m_isBoldLine = false;
+        SetBoldLine(false);
         VScaledLine::hoverLeaveEvent(event);
     }
 }

src/libs/vtools/tools/nodeDetails/nodedetails.h

@@ -1,41 +0,0 @@
-/************************************************************************
- **
- **  @file   nodedetails.h
- **  @author Roman Telezhynskyi <dismine(at)gmail.com>
- **  @date   November 15, 2013
- **
- **  @brief
- **  @copyright
- **  This source code is part of the Valentina project, a pattern making
- **  program, whose allow create and modeling patterns of clothing.
- **  Copyright (C) 2013-2015 Valentina project
- **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
- **
- **  Valentina is free software: you can redistribute it and/or modify
- **  it under the terms of the GNU General Public License as published by
- **  the Free Software Foundation, either version 3 of the License, or
- **  (at your option) any later version.
- **
- **  Valentina is distributed in the hope that it will be useful,
- **  but WITHOUT ANY WARRANTY; without even the implied warranty of
- **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- **  GNU General Public License for more details.
- **
- **  You should have received a copy of the GNU General Public License
- **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
- **
- *************************************************************************/
-
-#ifndef NODEDETAILS_H
-#define NODEDETAILS_H
-
-#include "vnodearc.h"
-#include "vnodeellipticalarc.h"
-#include "vnodepoint.h"
-#include "vnodespline.h"
-#include "vnodesplinepath.h"
-#include "vtoolpiecepath.h"
-#include "vtoolpin.h"
-#include "vtoolplacelabel.h"
-
-#endif // NODEDETAILS_H

src/libs/vtools/tools/nodeDetails/vnodepoint.cpp

@@ -55,6 +55,7 @@
 #include "../vpatterndb/vpiecenode.h"
 #include "../vwidgets/vmaingraphicsscene.h"
 #include "../vwidgets/vmaingraphicsview.h"
+#include "../vwidgets/global.h"
 #include "../vabstracttool.h"
 #include "../vdatatool.h"
 #include "vabstractnode.h"

src/libs/vtools/tools/nodeDetails/vtoolpiecepath.cpp

@@ -33,6 +33,7 @@
 #include "../../undocommands/savepieceoptions.h"
 #include "../vtoolseamallowance.h"
 #include "../ifc/xml/vabstractpattern.h"
+#include "../vwidgets/global.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VToolPiecePath *VToolPiecePath::Create(const QPointer<DialogTool> &dialog, VMainGraphicsScene *scene,

src/libs/vtools/tools/tools.h

@@ -1,35 +0,0 @@
-/************************************************************************
- **
- **  @file   tools.h
- **  @author Roman Telezhynskyi <dismine(at)gmail.com>
- **  @date   November 15, 2013
- **
- **  @brief
- **  @copyright
- **  This source code is part of the Valentina project, a pattern making
- **  program, whose allow create and modeling patterns of clothing.
- **  Copyright (C) 2013-2015 Valentina project
- **  <https://gitlab.com/smart-pattern/valentina> All Rights Reserved.
- **
- **  Valentina is free software: you can redistribute it and/or modify
- **  it under the terms of the GNU General Public License as published by
- **  the Free Software Foundation, either version 3 of the License, or
- **  (at your option) any later version.
- **
- **  Valentina is distributed in the hope that it will be useful,
- **  but WITHOUT ANY WARRANTY; without even the implied warranty of
- **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- **  GNU General Public License for more details.
- **
- **  You should have received a copy of the GNU General Public License
- **  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
- **
- *************************************************************************/
-
-#ifndef TOOLS_H
-#define TOOLS_H
-
-#include "drawTools/drawtools.h"
-#include "nodeDetails/nodedetails.h"
-
-#endif // TOOLS_H

src/libs/vtools/tools/tools.pri

@@ -9,7 +9,6 @@ HEADERS += \
     $$PWD/backgroundimage/vbackgroundimageitem.h \
     $$PWD/vdatatool.h \
     $$PWD/vabstracttool.h \
-    $$PWD/tools.h \
     $$PWD/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h \
     $$PWD/drawTools/toolcurve/vtoolsplinepath.h \
     $$PWD/drawTools/toolcurve/vtoolspline.h \
@@ -28,13 +27,11 @@ HEADERS += \
     $$PWD/drawTools/toolcurve/vtoolarc.h \
     $$PWD/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h \
     $$PWD/drawTools/vdrawtool.h \
-    $$PWD/drawTools/drawtools.h \
     $$PWD/nodeDetails/vnodesplinepath.h \
     $$PWD/nodeDetails/vnodespline.h \
     $$PWD/nodeDetails/vnodepoint.h \
     $$PWD/nodeDetails/vnodearc.h \
     $$PWD/nodeDetails/vabstractnode.h \
-    $$PWD/nodeDetails/nodedetails.h \
     $$PWD/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h \
     $$PWD/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h \
     $$PWD/vtooluniondetails.h \

src/libs/vtools/tools/vabstracttool.cpp

@@ -64,15 +64,18 @@
 #include "../vgeometry/vsplinepath.h"
 #include "../vgeometry/varc.h"
 #include "../vgeometry/vellipticalarc.h"
-#include "../vmisc/vcommonsettings.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vpatterndb/vpiecenode.h"
 #include "../vpatterndb/calculator.h"
-#include "../vwidgets/vgraphicssimpletextitem.h"
-#include "nodeDetails/nodedetails.h"
 #include "../dialogs/support/dialogundo.h"
 #include "../dialogs/support/dialogeditwrongformula.h"
 #include "toolsdef.h"
+#include "nodeDetails/vabstractnode.h"
+#include "nodeDetails/vnodepoint.h"
+#include "nodeDetails/vnodearc.h"
+#include "nodeDetails/vnodeellipticalarc.h"
+#include "nodeDetails/vnodespline.h"
+#include "nodeDetails/vnodesplinepath.h"
 
 template <class T> class QSharedPointer;
 

src/libs/vtools/tools/vabstracttool.h

@@ -44,7 +44,9 @@
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/def.h"
 #include "../vwidgets/vmaingraphicsscene.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "vdatatool.h"
 
 class VGraphicsSimpleTextItem;

src/libs/vtools/tools/vtoolseamallowance.cpp

@@ -34,15 +34,10 @@
 #include "../vpatterndb/calculator.h"
 #include "../vpatterndb/floatItemData/vpatternlabeldata.h"
 #include "../vpatterndb/floatItemData/vpiecelabeldata.h"
-#include "nodeDetails/nodedetails.h"
 #include "../vgeometry/varc.h"
-#include "../vgeometry/vellipticalarc.h"
-#include "../vgeometry/vcubicbezier.h"
-#include "../vgeometry/vcubicbezierpath.h"
 #include "../vgeometry/vpointf.h"
-#include "../vgeometry/vspline.h"
-#include "../vgeometry/vsplinepath.h"
 #include "../vgeometry/vplacelabelitem.h"
+#include "../vgeometry/vellipticalarc.h"
 #include "../ifc/xml/vpatternconverter.h"
 #include "../ifc/exception/vexceptionwrongid.h"
 #include "../undocommands/addpiece.h"
@@ -53,12 +48,20 @@
 #include "../vwidgets/vmaingraphicsview.h"
 #include "../vwidgets/vnobrushscalepathitem.h"
 #include "../vwidgets/vabstractmainwindow.h"
+#include "../vwidgets/global.h"
 #include "../qmuparser/qmutokenparser.h"
-#include "../vlayout/vlayoutdef.h"
 #include "toolsdef.h"
 #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
 #include "../vmisc/backport/qoverload.h"
 #endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
+#include "tools/nodeDetails/vtoolpin.h"
+#include "tools/nodeDetails/vnodepoint.h"
+#include "tools/nodeDetails/vtoolpiecepath.h"
+#include "tools/nodeDetails/vnodearc.h"
+#include "tools/nodeDetails/vnodeellipticalarc.h"
+#include "tools/nodeDetails/vnodespline.h"
+#include "tools/nodeDetails/vnodesplinepath.h"
+#include "tools/nodeDetails/vtoolplacelabel.h"
 
 #include <QFuture>
 #include <QtConcurrent/QtConcurrentRun>
@@ -69,6 +72,7 @@
 #include <QMessageBox>
 #include <QTimer>
 #include <QUuid>
+#include <QtMath>
 
 // Current version of seam allowance tag need for backward compatibility
 const quint8 VToolSeamAllowance::pieceVersion = 2;

src/libs/vtools/visualization/line/operation/vistoolmove.cpp

@@ -40,7 +40,9 @@
 #include <new>
 
 #include "../ifc/xml/vdomdocument.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/vmodifierkey.h"
 #include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/varc.h"
@@ -55,8 +57,8 @@
 #include "../vgeometry/varc.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vpatterndb/vcontainer.h"
-#include "../vwidgets/vmaingraphicsscene.h"
 #include "visoperation.h"
+#include "../vwidgets/global.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolMove::VisToolMove(const VContainer *data, QGraphicsItem *parent)

src/libs/vtools/visualization/line/operation/vistoolrotation.cpp

@@ -39,7 +39,9 @@
 #include <QtAlgorithms>
 #include <new>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/vmodifierkey.h"
 #include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/varc.h"
@@ -51,9 +53,8 @@
 #include "../vgeometry/vpointf.h"
 #include "../vgeometry/vspline.h"
 #include "../vgeometry/vsplinepath.h"
-#include "../vmisc/vabstractapplication.h"
 #include "../vpatterndb/vcontainer.h"
-#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/global.h"
 #include "visoperation.h"
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp

@@ -35,12 +35,12 @@
 #include <new>
 
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h"
-#include "../ifc/ifcdef.h"
 #include "../vgeometry/vgobject.h"
 #include "../vgeometry/vpointf.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../visualization.h"
 #include "visline.h"
+#include "../vwidgets/global.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolPointFromCircleAndTangent::VisToolPointFromCircleAndTangent(const VContainer *data, QGraphicsItem *parent)

src/libs/vtools/visualization/line/vistoolpointofcontact.cpp

@@ -36,11 +36,11 @@
 #include <new>
 
 #include "../../tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h"
-#include "../ifc/ifcdef.h"
 #include "../vgeometry/vpointf.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../visualization.h"
 #include "visline.h"
+#include "../vwidgets/global.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolPointOfContact::VisToolPointOfContact(const VContainer *data, QGraphicsItem *parent)

src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp

@@ -39,6 +39,7 @@
 #include "../vgeometry/vpointf.h"
 #include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/global.h"
 #include "../visualization.h"
 #include "visline.h"
 #include "../vmisc/vmodifierkey.h"

src/libs/vtools/visualization/path/vistoolspline.cpp

@@ -34,7 +34,6 @@
 #include <Qt>
 #include <new>
 
-#include "../ifc/ifcdef.h"
 #include "../vgeometry/vabstractcurve.h"
 #include "../vgeometry/vgeometrydef.h"
 #include "../vgeometry/vpointf.h"
@@ -42,6 +41,7 @@
 #include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/vcontrolpointspline.h"
 #include "../vwidgets/scalesceneitems.h"
+#include "../vwidgets/global.h"
 #include "../visualization.h"
 #include "vispath.h"
 #include "../vmisc/vmodifierkey.h"

src/libs/vtools/visualization/path/vistoolsplinepath.cpp

@@ -43,6 +43,7 @@
 #include "../vpatterndb/vcontainer.h"
 #include "../vwidgets/vcontrolpointspline.h"
 #include "../vwidgets/scalesceneitems.h"
+#include "../vwidgets/global.h"
 #include "../visualization.h"
 #include "vispath.h"
 #include "../vmisc/vmodifierkey.h"

src/libs/vtools/visualization/visualization.cpp

@@ -52,6 +52,7 @@
 #include "../vwidgets/vmaingraphicsscene.h"
 #include "../vwidgets/vcurvepathitem.h"
 #include "../vwidgets/scalesceneitems.h"
+#include "../vwidgets/global.h"
 
 template <class K, class V> class QHash;
 

src/libs/vtools/visualization/visualization.h

@@ -39,7 +39,6 @@
 #include "../vmisc/vabstractvalapplication.h"
 #include "../vwidgets/vmaingraphicsscene.h"
 #include "../vwidgets/vcurvepathitem.h"
-#include "../vwidgets/global.h"
 #include "../vgeometry/vabstractcurve.h"
 
 Q_DECLARE_LOGGING_CATEGORY(vVis)