diff --git a/src/libs/ifc/ifcdef.cpp b/src/libs/ifc/ifcdef.cpp index c1d2b89ee..e09f206e6 100644 --- a/src/libs/ifc/ifcdef.cpp +++ b/src/libs/ifc/ifcdef.cpp @@ -38,7 +38,9 @@ #include #include +#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("#"); diff --git a/src/libs/ifc/ifcdef.h b/src/libs/ifc/ifcdef.h index c6a55808a..80fcfc9d6 100644 --- a/src/libs/ifc/ifcdef.h +++ b/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; diff --git a/src/libs/ifc/xml/vdomdocument.h b/src/libs/ifc/xml/vdomdocument.h index b1d2e3485..0cc41be30 100644 --- a/src/libs/ifc/xml/vdomdocument.h +++ b/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; diff --git a/src/libs/qmuparser/qmuparsercallback_p.h b/src/libs/qmuparser/qmuparsercallback_p.h index e84dc3612..5b402080b 100644 --- a/src/libs/qmuparser/qmuparsercallback_p.h +++ b/src/libs/qmuparser/qmuparsercallback_p.h @@ -27,7 +27,9 @@ #include #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 diff --git a/src/libs/vdxf/libdxfrw/drw_entities.cpp b/src/libs/vdxf/libdxfrw/drw_entities.cpp index e63d2a700..54bf8c63d 100644 --- a/src/libs/vdxf/libdxfrw/drw_entities.cpp +++ b/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 diff --git a/src/libs/vdxf/libdxfrw/libdxfrw.cpp b/src/libs/vdxf/libdxfrw/libdxfrw.cpp index 1f0231c21..2a8bc6bb5 100644 --- a/src/libs/vdxf/libdxfrw/libdxfrw.cpp +++ b/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 diff --git a/src/libs/vdxf/vdxfengine.cpp b/src/libs/vdxf/vdxfengine.cpp index 842019bfd..ddb535adb 100644 --- a/src/libs/vdxf/vdxfengine.cpp +++ b/src/libs/vdxf/vdxfengine.cpp @@ -47,7 +47,9 @@ #include #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" diff --git a/src/libs/vformat/vpatternrecipe.cpp b/src/libs/vformat/vpatternrecipe.cpp index 592b5c36b..6497f8490 100644 --- a/src/libs/vformat/vpatternrecipe.cpp +++ b/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") diff --git a/src/libs/vgeometry/vabstractarc_p.h b/src/libs/vgeometry/vabstractarc_p.h index 75a8b46b5..610f4f1ea 100644 --- a/src/libs/vgeometry/vabstractarc_p.h +++ b/src/libs/vgeometry/vabstractarc_p.h @@ -32,7 +32,9 @@ #include #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 diff --git a/src/libs/vgeometry/vabstractcurve_p.h b/src/libs/vgeometry/vabstractcurve_p.h index 4fe8c2954..60fbb1f4d 100644 --- a/src/libs/vgeometry/vabstractcurve_p.h +++ b/src/libs/vgeometry/vabstractcurve_p.h @@ -32,7 +32,9 @@ #include #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++") diff --git a/src/libs/vgeometry/varc_p.h b/src/libs/vgeometry/varc_p.h index 25045ef5d..f88f3aa7e 100644 --- a/src/libs/vgeometry/varc_p.h +++ b/src/libs/vgeometry/varc_p.h @@ -32,7 +32,9 @@ #include #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++") diff --git a/src/libs/vgeometry/vcubicbezier_p.h b/src/libs/vgeometry/vcubicbezier_p.h index c277a5cdc..c6565db42 100644 --- a/src/libs/vgeometry/vcubicbezier_p.h +++ b/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 diff --git a/src/libs/vgeometry/vcubicbezierpath_p.h b/src/libs/vgeometry/vcubicbezierpath_p.h index cbb82d165..e7ca77a69 100644 --- a/src/libs/vgeometry/vcubicbezierpath_p.h +++ b/src/libs/vgeometry/vcubicbezierpath_p.h @@ -32,7 +32,9 @@ #include #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++") diff --git a/src/libs/vgeometry/vellipticalarc_p.h b/src/libs/vgeometry/vellipticalarc_p.h index 706591cc7..9aa8c58d1 100644 --- a/src/libs/vgeometry/vellipticalarc_p.h +++ b/src/libs/vgeometry/vellipticalarc_p.h @@ -3,7 +3,9 @@ #include #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 diff --git a/src/libs/vgeometry/vgobject_p.h b/src/libs/vgeometry/vgobject_p.h index 42954b1bd..a2a1b62d5 100644 --- a/src/libs/vgeometry/vgobject_p.h +++ b/src/libs/vgeometry/vgobject_p.h @@ -32,7 +32,9 @@ #include #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++") diff --git a/src/libs/vgeometry/vplacelabelitem_p.h b/src/libs/vgeometry/vplacelabelitem_p.h index 0951c0913..3c156f11c 100644 --- a/src/libs/vgeometry/vplacelabelitem_p.h +++ b/src/libs/vgeometry/vplacelabelitem_p.h @@ -31,7 +31,9 @@ #include #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++") diff --git a/src/libs/vgeometry/vpointf.h b/src/libs/vgeometry/vpointf.h index 5b6bd8bfb..588f0dd15 100644 --- a/src/libs/vgeometry/vpointf.h +++ b/src/libs/vgeometry/vpointf.h @@ -36,7 +36,9 @@ #include #include +#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" diff --git a/src/libs/vgeometry/vpointf_p.h b/src/libs/vgeometry/vpointf_p.h index 26ad6dc57..4b6b13e0e 100644 --- a/src/libs/vgeometry/vpointf_p.h +++ b/src/libs/vgeometry/vpointf_p.h @@ -31,7 +31,9 @@ #include #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 QT_WARNING_PUSH diff --git a/src/libs/vlayout/vabstractpiece_p.h b/src/libs/vlayout/vabstractpiece_p.h index dff919d3b..e17227360 100644 --- a/src/libs/vlayout/vabstractpiece_p.h +++ b/src/libs/vlayout/vabstractpiece_p.h @@ -34,7 +34,9 @@ #include #include +#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 diff --git a/src/libs/vlayout/vbestsquare_p.h b/src/libs/vlayout/vbestsquare_p.h index a2456b3fc..905fb4d4d 100644 --- a/src/libs/vlayout/vbestsquare_p.h +++ b/src/libs/vlayout/vbestsquare_p.h @@ -32,7 +32,9 @@ #include #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 diff --git a/src/libs/vlayout/vcontour_p.h b/src/libs/vlayout/vcontour_p.h index 30c22596a..00f9a243c 100644 --- a/src/libs/vlayout/vcontour_p.h +++ b/src/libs/vlayout/vcontour_p.h @@ -35,7 +35,9 @@ #include #include +#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 diff --git a/src/libs/vlayout/vlayoutpiece_p.h b/src/libs/vlayout/vlayoutpiece_p.h index 2d5c6c3eb..279be9480 100644 --- a/src/libs/vlayout/vlayoutpiece_p.h +++ b/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 diff --git a/src/libs/vlayout/vlayoutpiecepath_p.h b/src/libs/vlayout/vlayoutpiecepath_p.h index 2e020a337..1bd938b90 100644 --- a/src/libs/vlayout/vlayoutpiecepath_p.h +++ b/src/libs/vlayout/vlayoutpiecepath_p.h @@ -34,7 +34,9 @@ #include #include +#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 diff --git a/src/libs/vlayout/vrawsapoint.h b/src/libs/vlayout/vrawsapoint.h index 7df23f1c7..9f9512873 100644 --- a/src/libs/vlayout/vrawsapoint.h +++ b/src/libs/vlayout/vrawsapoint.h @@ -30,7 +30,9 @@ #include +#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 diff --git a/src/libs/vlayout/vsapoint.h b/src/libs/vlayout/vsapoint.h index 00ee4b3c2..31f70de13 100644 --- a/src/libs/vlayout/vsapoint.h +++ b/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" diff --git a/src/libs/vmisc/backport/qoverload.h b/src/libs/vmisc/backport/qoverload.h index 13e030a13..5f258a4cf 100644 --- a/src/libs/vmisc/backport/qoverload.h +++ b/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++") diff --git a/src/libs/vmisc/qxtcsvmodel.cpp b/src/libs/vmisc/qxtcsvmodel.cpp index ad039ebd1..ab49d5610 100644 --- a/src/libs/vmisc/qxtcsvmodel.cpp +++ b/src/libs/vmisc/qxtcsvmodel.cpp @@ -41,7 +41,9 @@ #include #include +#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 { diff --git a/src/libs/vmisc/vlockguard.h b/src/libs/vmisc/vlockguard.h index 56060d72d..443a4a15c 100644 --- a/src/libs/vmisc/vlockguard.h +++ b/src/libs/vmisc/vlockguard.h @@ -38,7 +38,9 @@ #include #include +#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 diff --git a/src/libs/vobj/delaunay.cpp b/src/libs/vobj/delaunay.cpp index 58dce2838..6f96d10e6 100644 --- a/src/libs/vobj/delaunay.cpp +++ b/src/libs/vobj/delaunay.cpp @@ -23,7 +23,9 @@ #include #include +#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 diff --git a/src/libs/vobj/predicates.cpp b/src/libs/vobj/predicates.cpp index c6e331c54..737c81ea4 100644 --- a/src/libs/vobj/predicates.cpp +++ b/src/libs/vobj/predicates.cpp @@ -107,7 +107,9 @@ #include +#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) diff --git a/src/libs/vobj/vobjengine.cpp b/src/libs/vobj/vobjengine.cpp index 7db881be4..6a8ba4b8f 100644 --- a/src/libs/vobj/vobjengine.cpp +++ b/src/libs/vobj/vobjengine.cpp @@ -43,7 +43,9 @@ #include #include +#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; diff --git a/src/libs/vpatterndb/variables/vincrement_p.h b/src/libs/vpatterndb/variables/vincrement_p.h index f91701594..9a67413e4 100644 --- a/src/libs/vpatterndb/variables/vincrement_p.h +++ b/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++") diff --git a/src/libs/vpatterndb/variables/vmeasurement_p.h b/src/libs/vpatterndb/variables/vmeasurement_p.h index 6b9d3f24c..ec63d7311 100644 --- a/src/libs/vpatterndb/variables/vmeasurement_p.h +++ b/src/libs/vpatterndb/variables/vmeasurement_p.h @@ -32,7 +32,9 @@ #include #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++") diff --git a/src/libs/vpatterndb/vcontainer.h b/src/libs/vpatterndb/vcontainer.h index 675489660..91358ae47 100644 --- a/src/libs/vpatterndb/vcontainer.h +++ b/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" diff --git a/src/libs/vpatterndb/vformula_p.h b/src/libs/vpatterndb/vformula_p.h index 0936f0fbe..ef65b9f4a 100644 --- a/src/libs/vpatterndb/vformula_p.h +++ b/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" diff --git a/src/libs/vpatterndb/vnodedetail_p.h b/src/libs/vpatterndb/vnodedetail_p.h index f75397aa3..421c303a0 100644 --- a/src/libs/vpatterndb/vnodedetail_p.h +++ b/src/libs/vpatterndb/vnodedetail_p.h @@ -31,7 +31,9 @@ #include #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++") diff --git a/src/libs/vpatterndb/vpiece_p.h b/src/libs/vpatterndb/vpiece_p.h index 1d33a7310..494d84c69 100644 --- a/src/libs/vpatterndb/vpiece_p.h +++ b/src/libs/vpatterndb/vpiece_p.h @@ -32,7 +32,9 @@ #include #include +#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" diff --git a/src/libs/vpatterndb/vpiecenode_p.h b/src/libs/vpatterndb/vpiecenode_p.h index f603014bd..941918e63 100644 --- a/src/libs/vpatterndb/vpiecenode_p.h +++ b/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 diff --git a/src/libs/vpatterndb/vpiecepath_p.h b/src/libs/vpatterndb/vpiecepath_p.h index 5a4be9247..f0b90a09e 100644 --- a/src/libs/vpatterndb/vpiecepath_p.h +++ b/src/libs/vpatterndb/vpiecepath_p.h @@ -32,7 +32,9 @@ #include #include +#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 diff --git a/src/libs/vpropertyexplorer/vabstractpropertyfactory.h b/src/libs/vpropertyexplorer/vabstractpropertyfactory.h index b8b1068c3..64d6b12ef 100644 --- a/src/libs/vpropertyexplorer/vabstractpropertyfactory.h +++ b/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 namespace VPE diff --git a/src/libs/vpropertyexplorer/vpropertyformview_p.h b/src/libs/vpropertyexplorer/vpropertyformview_p.h index 2990f0930..e08522d45 100644 --- a/src/libs/vpropertyexplorer/vpropertyformview_p.h +++ b/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 { diff --git a/src/libs/vpropertyexplorer/vpropertyformwidget_p.h b/src/libs/vpropertyexplorer/vpropertyformwidget_p.h index 6a83149a9..e7dced946 100644 --- a/src/libs/vpropertyexplorer/vpropertyformwidget_p.h +++ b/src/libs/vpropertyexplorer/vpropertyformwidget_p.h @@ -25,7 +25,9 @@ #include #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 { diff --git a/src/libs/vpropertyexplorer/vwidgetproperty_p.h b/src/libs/vpropertyexplorer/vwidgetproperty_p.h index b583ffa7f..b31c9439c 100644 --- a/src/libs/vpropertyexplorer/vwidgetproperty_p.h +++ b/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 #include diff --git a/src/libs/vtools/dialogs/tools/dialogarc.cpp b/src/libs/vtools/dialogs/tools/dialogarc.cpp index 52d703359..80bb3b19a 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.cpp +++ b/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" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp index a036d9a8a..6822257d6 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp @@ -38,7 +38,6 @@ #include #include -#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) diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp index 41de95491..c1d00da75 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/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) diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp index 43fc686c5..2689a6ddc 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.cpp +++ b/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" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp index b4a070ddd..9a1cc7837 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp +++ b/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" diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp index ba3fd92a7..33db7062b 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp +++ b/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" diff --git a/src/libs/vtools/tools/drawTools/drawtools.h b/src/libs/vtools/tools/drawTools/drawtools.h deleted file mode 100644 index ef073d0f2..000000000 --- a/src/libs/vtools/tools/drawTools/drawtools.h +++ /dev/null @@ -1,67 +0,0 @@ -/************************************************************************ - ** - ** @file drawtools.h - ** @author Roman Telezhynskyi - ** @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 - ** 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 . - ** - *************************************************************************/ - -#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 diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp index 9f7bae9a9..d9c0bad27 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp +++ b/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" diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp index 698fcb063..c7c703ded 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp +++ b/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" diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp index 7e18864be..21b988e0e 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp +++ b/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" diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp index 08b02c6b2..6f0e38fd6 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp +++ b/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" diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp index f05d6b1e3..450e7a049 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp +++ b/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" diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index f1dcbb15f..ed78d4d19 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #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" diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index 3c869ba92..bd3ea8b5e 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #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" diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp index 6e1440658..e964bd156 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp +++ b/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 QSharedPointer; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp index f381c9505..4d7ed9f90 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp +++ b/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" diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp index ddfe41866..5b16060c7 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.cpp +++ b/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); } } diff --git a/src/libs/vtools/tools/nodeDetails/nodedetails.h b/src/libs/vtools/tools/nodeDetails/nodedetails.h deleted file mode 100644 index bd2d4e380..000000000 --- a/src/libs/vtools/tools/nodeDetails/nodedetails.h +++ /dev/null @@ -1,41 +0,0 @@ -/************************************************************************ - ** - ** @file nodedetails.h - ** @author Roman Telezhynskyi - ** @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 - ** 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 . - ** - *************************************************************************/ - -#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 diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp index e39e82378..866f82884 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp +++ b/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" diff --git a/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.cpp b/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.cpp index e0ad5a386..9ab0183b1 100644 --- a/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.cpp +++ b/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 &dialog, VMainGraphicsScene *scene, diff --git a/src/libs/vtools/tools/tools.h b/src/libs/vtools/tools/tools.h deleted file mode 100644 index fbf81888c..000000000 --- a/src/libs/vtools/tools/tools.h +++ /dev/null @@ -1,35 +0,0 @@ -/************************************************************************ - ** - ** @file tools.h - ** @author Roman Telezhynskyi - ** @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 - ** 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 . - ** - *************************************************************************/ - -#ifndef TOOLS_H -#define TOOLS_H - -#include "drawTools/drawtools.h" -#include "nodeDetails/nodedetails.h" - -#endif // TOOLS_H diff --git a/src/libs/vtools/tools/tools.pri b/src/libs/vtools/tools/tools.pri index 6fddcfced..40840ad88 100644 --- a/src/libs/vtools/tools/tools.pri +++ b/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 \ diff --git a/src/libs/vtools/tools/vabstracttool.cpp b/src/libs/vtools/tools/vabstracttool.cpp index 46a6a0728..b1c5af0b3 100644 --- a/src/libs/vtools/tools/vabstracttool.cpp +++ b/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 QSharedPointer; diff --git a/src/libs/vtools/tools/vabstracttool.h b/src/libs/vtools/tools/vabstracttool.h index d93e1a48a..e145b12e4 100644 --- a/src/libs/vtools/tools/vabstracttool.h +++ b/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; diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp index c0ec5685e..a2da3c084 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.cpp +++ b/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 #include @@ -69,6 +72,7 @@ #include #include #include +#include // Current version of seam allowance tag need for backward compatibility const quint8 VToolSeamAllowance::pieceVersion = 2; diff --git a/src/libs/vtools/visualization/line/operation/vistoolmove.cpp b/src/libs/vtools/visualization/line/operation/vistoolmove.cpp index 0571b6e5c..40da9035e 100644 --- a/src/libs/vtools/visualization/line/operation/vistoolmove.cpp +++ b/src/libs/vtools/visualization/line/operation/vistoolmove.cpp @@ -40,7 +40,9 @@ #include #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) diff --git a/src/libs/vtools/visualization/line/operation/vistoolrotation.cpp b/src/libs/vtools/visualization/line/operation/vistoolrotation.cpp index 0321ec6e1..28699490d 100644 --- a/src/libs/vtools/visualization/line/operation/vistoolrotation.cpp +++ b/src/libs/vtools/visualization/line/operation/vistoolrotation.cpp @@ -39,7 +39,9 @@ #include #include +#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" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp index d7c20bbb3..d27e6079c 100644 --- a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp @@ -35,12 +35,12 @@ #include #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) diff --git a/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp b/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp index 4539c22a3..b3c533c65 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp @@ -36,11 +36,11 @@ #include #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) diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp index 7c7ee887d..fd64ee36c 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp +++ b/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" diff --git a/src/libs/vtools/visualization/path/vistoolspline.cpp b/src/libs/vtools/visualization/path/vistoolspline.cpp index bfbcbd52a..c9ba2905c 100644 --- a/src/libs/vtools/visualization/path/vistoolspline.cpp +++ b/src/libs/vtools/visualization/path/vistoolspline.cpp @@ -34,7 +34,6 @@ #include #include -#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" diff --git a/src/libs/vtools/visualization/path/vistoolsplinepath.cpp b/src/libs/vtools/visualization/path/vistoolsplinepath.cpp index 5a62e60d1..31f07c0fb 100644 --- a/src/libs/vtools/visualization/path/vistoolsplinepath.cpp +++ b/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" diff --git a/src/libs/vtools/visualization/visualization.cpp b/src/libs/vtools/visualization/visualization.cpp index 13829b8d0..a2dff1123 100644 --- a/src/libs/vtools/visualization/visualization.cpp +++ b/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 QHash; diff --git a/src/libs/vtools/visualization/visualization.h b/src/libs/vtools/visualization/visualization.h index 6fec205d3..514283b2c 100644 --- a/src/libs/vtools/visualization/visualization.h +++ b/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)