From d66280033bd233d2905d2a121a9e39d1310114a9 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Aug 2016 19:57:32 +0300 Subject: [PATCH] Fixed issue #546. Compile error under Windows in current develop revision. --HG-- branch : develop --- src/app/valentina/core/vapplication.cpp | 2 +- src/app/valentina/dialogs/dialoglayoutsettings.cpp | 7 +------ src/app/valentina/xml/vpattern.cpp | 2 +- src/libs/qmuparser/qmuparser.cpp | 3 +-- src/libs/qmuparser/qmuparserbase.cpp | 6 +++--- src/libs/qmuparser/qmuparserbytecode.cpp | 2 +- src/libs/qmuparser/qmuparsertest.cpp | 2 +- src/libs/vdxf/dxflib/dl_extrusion.h | 5 ++--- src/libs/vdxf/vdxfengine.cpp | 7 +------ src/libs/vgeometry/vabstractcubicbezier.cpp | 2 +- src/libs/vgeometry/varc.cpp | 2 +- src/libs/vgeometry/vcubicbezier_p.h | 2 +- src/libs/vgeometry/vcubicbezierpath.cpp | 7 +------ src/libs/vgeometry/vellipticalarc.cpp | 3 +-- src/libs/vgeometry/vgobject.cpp | 3 +-- src/libs/vgeometry/vspline.cpp | 2 +- src/libs/vgeometry/vspline_p.h | 2 +- src/libs/vgeometry/vsplinepath.cpp | 6 +----- src/libs/vlayout/vcontour.cpp | 7 +------ src/libs/vlayout/vlayoutdetail.cpp | 10 +--------- src/libs/vlayout/vlayoutgenerator.cpp | 2 +- src/libs/vlayout/vposition.cpp | 7 +------ src/libs/vlayout/vposter.cpp | 7 +------ src/libs/vmisc/vcommonsettings.cpp | 6 +----- src/libs/vmisc/vmath.h | 8 +++++--- src/libs/vmisc/vsettings.cpp | 6 +----- src/libs/vobj/vobjengine.cpp | 7 +------ src/libs/vpatterndb/variables/vlineangle.cpp | 7 +------ .../vtools/dialogs/tools/dialogcubicbezierpath.cpp | 6 +----- .../vtools/tools/drawTools/toolcurve/vtoolspline.cpp | 8 +------- .../tools/drawTools/toolcurve/vtoolsplinepath.cpp | 8 +------- .../toolpoint/toolsinglepoint/vtooltriangle.cpp | 2 +- src/libs/vtools/tools/vtextgraphicsitem.cpp | 3 +-- src/libs/vtools/visualization/line/visline.cpp | 2 +- src/libs/vtools/visualization/line/vistooltriangle.cpp | 2 +- src/libs/vwidgets/vmaingraphicsview.cpp | 2 +- 36 files changed, 43 insertions(+), 122 deletions(-) diff --git a/src/app/valentina/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp index 17d1333a0..1a7f4a303 100644 --- a/src/app/valentina/core/vapplication.cpp +++ b/src/app/valentina/core/vapplication.cpp @@ -35,6 +35,7 @@ #include "../vwidgets/vmaingraphicsview.h" #include "../version.h" #include "../vmisc/logging.h" +#include "../vmisc/vmath.h" #include "../qmuparser/qmuparsererror.h" #include "../mainwindow.h" @@ -43,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/src/app/valentina/dialogs/dialoglayoutsettings.cpp b/src/app/valentina/dialogs/dialoglayoutsettings.cpp index 99e9ba304..df271b77c 100644 --- a/src/app/valentina/dialogs/dialoglayoutsettings.cpp +++ b/src/app/valentina/dialogs/dialoglayoutsettings.cpp @@ -31,12 +31,7 @@ #include "../core/vapplication.h" #include "../ifc/xml/vdomdocument.h" #include "../vmisc/vsettings.h" - -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -# include -#endif +#include "../vmisc/vmath.h" #include #include diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index fcf070350..4dae1eac9 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -41,6 +41,7 @@ #include "../ifc/xml/vpatternconverter.h" #include "../vmisc/undoevent.h" #include "../vmisc/vsettings.h" +#include "../vmisc/vmath.h" #include "../qmuparser/qmuparsererror.h" #include "../vgeometry/varc.h" #include "../vgeometry/vsplinepath.h" @@ -53,7 +54,6 @@ #include #include -#include #include const QString VPattern::AttrReadOnly = QStringLiteral("readOnly"); diff --git a/src/libs/qmuparser/qmuparser.cpp b/src/libs/qmuparser/qmuparser.cpp index 4d7164c87..68f8dccc3 100644 --- a/src/libs/qmuparser/qmuparser.cpp +++ b/src/libs/qmuparser/qmuparser.cpp @@ -21,8 +21,6 @@ #include "qmuparser.h" -#include -#include #include #include #include @@ -33,6 +31,7 @@ #include "qmuparserdef.h" #include "qmuparsererror.h" +#include "../vmisc/vmath.h" using namespace std; diff --git a/src/libs/qmuparser/qmuparserbase.cpp b/src/libs/qmuparser/qmuparserbase.cpp index 9c3ce6603..8cbe17603 100644 --- a/src/libs/qmuparser/qmuparserbase.cpp +++ b/src/libs/qmuparser/qmuparserbase.cpp @@ -29,14 +29,14 @@ #include #include #include - -#include "qmudef.h" #ifdef QMUP_USE_OPENMP #include #endif -#include #include +#include "qmudef.h" +#include "../vmisc/vmath.h" + using namespace std; /** diff --git a/src/libs/qmuparser/qmuparserbytecode.cpp b/src/libs/qmuparser/qmuparserbytecode.cpp index 53d408a2a..58a78750f 100644 --- a/src/libs/qmuparser/qmuparserbytecode.cpp +++ b/src/libs/qmuparser/qmuparserbytecode.cpp @@ -21,7 +21,6 @@ #include "qmuparserbytecode.h" -#include #include #include #include @@ -31,6 +30,7 @@ #include "qmudef.h" #include "qmuparsererror.h" +#include "../vmisc/vmath.h" namespace qmu { diff --git a/src/libs/qmuparser/qmuparsertest.cpp b/src/libs/qmuparser/qmuparsertest.cpp index 5426ee9d2..6f9a9985f 100644 --- a/src/libs/qmuparser/qmuparsertest.cpp +++ b/src/libs/qmuparser/qmuparsertest.cpp @@ -21,7 +21,6 @@ #include "qmuparsertest.h" -#include #include #include #include @@ -41,6 +40,7 @@ #include "qmudef.h" #include "qmuparser.h" #include "qmuparsererror.h" +#include "../vmisc/vmath.h" using namespace std; diff --git a/src/libs/vdxf/dxflib/dl_extrusion.h b/src/libs/vdxf/dxflib/dl_extrusion.h index 46eb8bdff..dcde7bcdd 100644 --- a/src/libs/vdxf/dxflib/dl_extrusion.h +++ b/src/libs/vdxf/dxflib/dl_extrusion.h @@ -27,8 +27,7 @@ #include "dl_global.h" -#include - +#include "../vmisc/vmath.h" /** * Storing and passing around attributes. Attributes @@ -103,7 +102,7 @@ public: /** * @param dir vector. */ - void getDirection(double dir[]) const + void getDirection(double dir[]) const { dir[0]=direction[0]; dir[1]=direction[1]; diff --git a/src/libs/vdxf/vdxfengine.cpp b/src/libs/vdxf/vdxfengine.cpp index ea570f5ea..cb91b9469 100644 --- a/src/libs/vdxf/vdxfengine.cpp +++ b/src/libs/vdxf/vdxfengine.cpp @@ -28,7 +28,6 @@ #include "vdxfengine.h" -#include #include #include #include @@ -49,6 +48,7 @@ #include "../vmisc/def.h" #include "../vmisc/diagnostic.h" +#include "../vmisc/vmath.h" #include "dxflib/dl_attributes.h" #include "dxflib/dl_codes.h" #include "dxflib/dl_dxf.h" @@ -65,11 +65,6 @@ class QPolygonF; class QRect; class QRectF; -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif - //--------------------------------------------------------------------------------------------------------------------- static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures() { diff --git a/src/libs/vgeometry/vabstractcubicbezier.cpp b/src/libs/vgeometry/vabstractcubicbezier.cpp index 5d658a7ec..df399cdd0 100644 --- a/src/libs/vgeometry/vabstractcubicbezier.cpp +++ b/src/libs/vgeometry/vabstractcubicbezier.cpp @@ -28,7 +28,6 @@ #include "vabstractcubicbezier.h" -#include #include #include #include @@ -36,6 +35,7 @@ #include #include "../vmisc/def.h" +#include "../vmisc/vmath.h" #include "../vgeometry/vpointf.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vgeometry/varc.cpp b/src/libs/vgeometry/varc.cpp index 5d3cb083f..56b1f18e4 100644 --- a/src/libs/vgeometry/varc.cpp +++ b/src/libs/vgeometry/varc.cpp @@ -28,11 +28,11 @@ #include "varc.h" -#include #include #include #include "../vmisc/def.h" +#include "../vmisc/vmath.h" #include "../ifc/ifcdef.h" #include "vabstractcurve.h" #include "varc_p.h" diff --git a/src/libs/vgeometry/vcubicbezier_p.h b/src/libs/vgeometry/vcubicbezier_p.h index f94c6931f..548b9ea21 100644 --- a/src/libs/vgeometry/vcubicbezier_p.h +++ b/src/libs/vgeometry/vcubicbezier_p.h @@ -31,11 +31,11 @@ #include #include -#include #include "vpointf.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/diagnostic.h" +#include "../vmisc/vmath.h" QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Weffc++") diff --git a/src/libs/vgeometry/vcubicbezierpath.cpp b/src/libs/vgeometry/vcubicbezierpath.cpp index 3ec8acbd2..496354a8a 100644 --- a/src/libs/vgeometry/vcubicbezierpath.cpp +++ b/src/libs/vgeometry/vcubicbezierpath.cpp @@ -28,21 +28,16 @@ #include "vcubicbezierpath.h" -#include #include #include #include "../ifc/exception/vexception.h" +#include "../vmisc/vmath.h" #include "vabstractcurve.h" #include "vcubicbezierpath_p.h" #include "vspline.h" #include "vsplinepoint.h" -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif - //--------------------------------------------------------------------------------------------------------------------- VCubicBezierPath::VCubicBezierPath(quint32 idObject, Draw mode) : VAbstractCubicBezierPath(GOType::CubicBezierPath, idObject, mode), diff --git a/src/libs/vgeometry/vellipticalarc.cpp b/src/libs/vgeometry/vellipticalarc.cpp index f58a89dbd..ce2dab7cf 100644 --- a/src/libs/vgeometry/vellipticalarc.cpp +++ b/src/libs/vgeometry/vellipticalarc.cpp @@ -28,12 +28,11 @@ #include "vellipticalarc.h" -#include -#include #include #include #include "../vmisc/def.h" +#include "../vmisc/vmath.h" #include "../ifc/ifcdef.h" #include "../vmisc/vabstractapplication.h" #include "vabstractcurve.h" diff --git a/src/libs/vgeometry/vgobject.cpp b/src/libs/vgeometry/vgobject.cpp index 9934f7363..e9e91f1cd 100644 --- a/src/libs/vgeometry/vgobject.cpp +++ b/src/libs/vgeometry/vgobject.cpp @@ -28,8 +28,6 @@ #include "vgobject.h" -#include -#include #include #include #include @@ -37,6 +35,7 @@ #include #include "../vmisc/def.h" +#include "../vmisc/vmath.h" #include "../ifc/ifcdef.h" #include "vgobject_p.h" diff --git a/src/libs/vgeometry/vspline.cpp b/src/libs/vgeometry/vspline.cpp index 4ad845f8f..b4834b796 100644 --- a/src/libs/vgeometry/vspline.cpp +++ b/src/libs/vgeometry/vspline.cpp @@ -28,11 +28,11 @@ #include "vspline.h" -#include #include #include "vabstractcurve.h" #include "vspline_p.h" +#include "../vmisc/vmath.h" class QPointF; diff --git a/src/libs/vgeometry/vspline_p.h b/src/libs/vgeometry/vspline_p.h index 43d8fb532..8ff0535d4 100644 --- a/src/libs/vgeometry/vspline_p.h +++ b/src/libs/vgeometry/vspline_p.h @@ -31,10 +31,10 @@ #include #include -#include #include "vpointf.h" #include "../vmisc/vabstractapplication.h" +#include "../vmisc/vmath.h" QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Weffc++") diff --git a/src/libs/vgeometry/vsplinepath.cpp b/src/libs/vgeometry/vsplinepath.cpp index 99bdffc71..e3376b348 100644 --- a/src/libs/vgeometry/vsplinepath.cpp +++ b/src/libs/vgeometry/vsplinepath.cpp @@ -31,14 +31,10 @@ #include #include "../ifc/exception/vexception.h" +#include "../vmisc/vmath.h" #include "vabstractcurve.h" #include "vsplinepath_p.h" -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif - //--------------------------------------------------------------------------------------------------------------------- /** * @brief VSplinePath constructor. diff --git a/src/libs/vlayout/vcontour.cpp b/src/libs/vlayout/vcontour.cpp index b5ccd2b80..3a703081f 100644 --- a/src/libs/vlayout/vcontour.cpp +++ b/src/libs/vlayout/vcontour.cpp @@ -28,7 +28,6 @@ #include "vcontour.h" -#include #include #include #include @@ -39,11 +38,7 @@ #include "vcontour_p.h" #include "vlayoutdetail.h" - -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif +#include "../vmisc/vmath.h" //--------------------------------------------------------------------------------------------------------------------- VContour::VContour() diff --git a/src/libs/vlayout/vlayoutdetail.cpp b/src/libs/vlayout/vlayoutdetail.cpp index 17ef791b7..5764f4246 100644 --- a/src/libs/vlayout/vlayoutdetail.cpp +++ b/src/libs/vlayout/vlayoutdetail.cpp @@ -28,8 +28,6 @@ #include "vlayoutdetail.h" -#include -#include #include #include #include @@ -47,6 +45,7 @@ #include "../vpatterndb/vpatterninfogeometry.h" #include "../vpatterndb/vpatternpiecedata.h" +#include "../vmisc/vmath.h" #include "vlayoutdef.h" #include "vlayoutdetail_p.h" #include "vtextmanager.h" @@ -55,13 +54,6 @@ class QGraphicsPathItem; class QLineF; class VAbstractPattern; -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif - -#include - //--------------------------------------------------------------------------------------------------------------------- VLayoutDetail::VLayoutDetail() :VAbstractDetail(), d(new VLayoutDetailData) diff --git a/src/libs/vlayout/vlayoutgenerator.cpp b/src/libs/vlayout/vlayoutgenerator.cpp index 5b5201403..ed0359639 100644 --- a/src/libs/vlayout/vlayoutgenerator.cpp +++ b/src/libs/vlayout/vlayoutgenerator.cpp @@ -28,12 +28,12 @@ #include "vlayoutgenerator.h" -#include #include #include #include #include "../vmisc/def.h" +#include "../vmisc/vmath.h" #include "vlayoutdetail.h" #include "vlayoutpaper.h" diff --git a/src/libs/vlayout/vposition.cpp b/src/libs/vlayout/vposition.cpp index 0cabd0e84..c1288551d 100644 --- a/src/libs/vlayout/vposition.cpp +++ b/src/libs/vlayout/vposition.cpp @@ -28,7 +28,6 @@ #include "vposition.h" -#include #include #include #include @@ -48,11 +47,7 @@ #include #include "../vmisc/def.h" - -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif +#include "../vmisc/vmath.h" //--------------------------------------------------------------------------------------------------------------------- VPosition::VPosition(const VContour &gContour, int j, const VLayoutDetail &detail, int i, volatile bool *stop, diff --git a/src/libs/vlayout/vposter.cpp b/src/libs/vlayout/vposter.cpp index 7378add1d..d413ab148 100644 --- a/src/libs/vlayout/vposter.cpp +++ b/src/libs/vlayout/vposter.cpp @@ -28,7 +28,6 @@ #include "vposter.h" -#include #include #include #include @@ -40,11 +39,7 @@ #include #include -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif - +#include "../vmisc/vmath.h" #include "../vmisc/def.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vmisc/vcommonsettings.cpp b/src/libs/vmisc/vcommonsettings.cpp index 97ddf645c..c30495f0c 100644 --- a/src/libs/vmisc/vcommonsettings.cpp +++ b/src/libs/vmisc/vcommonsettings.cpp @@ -41,14 +41,10 @@ #include #include "../vmisc/def.h" +#include "../vmisc/vmath.h" class QDate; -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif - const QString VCommonSettings::SettingPathsIndividualMeasurements = QStringLiteral("paths/individual_measurements"); const QString VCommonSettings::SettingPathsStandardMeasurements = QStringLiteral("paths/standard_measurements"); const QString VCommonSettings::SettingPathsTemplates = QStringLiteral("paths/templates"); diff --git a/src/libs/vmisc/vmath.h b/src/libs/vmisc/vmath.h index 77f02a9a7..2cda433fe 100644 --- a/src/libs/vmisc/vmath.h +++ b/src/libs/vmisc/vmath.h @@ -18,10 +18,12 @@ ** ****************************************************************************/ -#ifndef QMATH_H -#define QMATH_H +#ifndef VMATH_H +#define VMATH_H -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) +#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) +#include +#else #if 0 #pragma qt_class(QtMath) diff --git a/src/libs/vmisc/vsettings.cpp b/src/libs/vmisc/vsettings.cpp index 7de98c245..d7f39df48 100644 --- a/src/libs/vmisc/vsettings.cpp +++ b/src/libs/vmisc/vsettings.cpp @@ -39,14 +39,10 @@ #include #include "../vmisc/def.h" +#include "../vmisc/vmath.h" class QMarginsF; -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif - Q_DECLARE_METATYPE(QMarginsF) const QString VSettings::SettingConfigurationLabelLanguage = QStringLiteral("configuration/label_language"); diff --git a/src/libs/vobj/vobjengine.cpp b/src/libs/vobj/vobjengine.cpp index ddd1e0954..866e239d1 100644 --- a/src/libs/vobj/vobjengine.cpp +++ b/src/libs/vobj/vobjengine.cpp @@ -28,7 +28,6 @@ #include "vobjengine.h" -#include #include #include #include @@ -45,6 +44,7 @@ #include #include "../vmisc/diagnostic.h" +#include "../vmisc/vmath.h" class QPaintDevice; class QPixmap; @@ -53,11 +53,6 @@ class QPointF; class QPolygonF; class QRectF; -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif - #ifdef Q_CC_MSVC #include #endif /* Q_CC_MSVC */ diff --git a/src/libs/vpatterndb/variables/vlineangle.cpp b/src/libs/vpatterndb/variables/vlineangle.cpp index 6b117fb89..9f92841e8 100644 --- a/src/libs/vpatterndb/variables/vlineangle.cpp +++ b/src/libs/vpatterndb/variables/vlineangle.cpp @@ -28,23 +28,18 @@ #include "vlineangle.h" -#include #include #include #include #include #include "../vmisc/def.h" +#include "../vmisc/vmath.h" #include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "vinternalvariable.h" #include "vlineangle_p.h" -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif - //--------------------------------------------------------------------------------------------------------------------- VLineAngle::VLineAngle() :VInternalVariable(), d(new VLineAngleData) diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp index 48b8efc8e..194415fb6 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp @@ -48,6 +48,7 @@ #include "../../visualization/visualization.h" #include "../ifc/ifcdef.h" #include "../vmisc/vabstractapplication.h" +#include "../vmisc/vmath.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vabstractmainwindow.h" #include "dialogtool.h" @@ -55,11 +56,6 @@ class QWidget; -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif - //--------------------------------------------------------------------------------------------------------------------- DialogCubicBezierPath::DialogCubicBezierPath(const VContainer *data, const quint32 &toolId, QWidget *parent) : DialogTool(data, toolId, parent), diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index 5f9f01134..a4943d1a9 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp @@ -28,8 +28,6 @@ #include "vtoolspline.h" -#include -#include #include #include #include @@ -63,6 +61,7 @@ #include "../vgeometry/vpointf.h" #include "../vgeometry/vspline.h" #include "../vmisc/vabstractapplication.h" +#include "../vmisc/vmath.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vcontrolpointspline.h" #include "../vwidgets/vmaingraphicsscene.h" @@ -75,11 +74,6 @@ class QGraphicsSceneContextMenuEvent; class QGraphicsSceneHoverEvent; class QGraphicsSceneMouseEvent; -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif - const QString VToolSpline::ToolType = QStringLiteral("simpleInteractive"); const QString VToolSpline::OldToolType = QStringLiteral("simple"); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index 9f224c40f..e58082042 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -28,8 +28,6 @@ #include "vtoolsplinepath.h" -#include -#include #include #include #include @@ -67,6 +65,7 @@ #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" @@ -80,11 +79,6 @@ class QGraphicsSceneContextMenuEvent; class QGraphicsSceneHoverEvent; class QGraphicsSceneMouseEvent; -#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../vmisc/vmath.h" -#else -#endif - const QString VToolSplinePath::ToolType = QStringLiteral("pathInteractive"); const QString VToolSplinePath::OldToolType = QStringLiteral("path"); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp index 9424f58b5..5933c03f0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp @@ -28,7 +28,6 @@ #include "vtooltriangle.h" -#include #include #include #include @@ -50,6 +49,7 @@ #include "../../../vabstracttool.h" #include "../../vdrawtool.h" #include "vtoolsinglepoint.h" +#include "../vmisc/vmath.h" class QDomElement; class QGraphicsSceneContextMenuEvent; diff --git a/src/libs/vtools/tools/vtextgraphicsitem.cpp b/src/libs/vtools/tools/vtextgraphicsitem.cpp index 5fd5e2a41..64107936b 100644 --- a/src/libs/vtools/tools/vtextgraphicsitem.cpp +++ b/src/libs/vtools/tools/vtextgraphicsitem.cpp @@ -26,8 +26,6 @@ ** *************************************************************************/ -#include -#include #include #include #include @@ -41,6 +39,7 @@ #include #include "../vmisc/def.h" +#include "../vmisc/vmath.h" #include "vtextgraphicsitem.h" class QGraphicsSceneHoverEvent; diff --git a/src/libs/vtools/visualization/line/visline.cpp b/src/libs/vtools/visualization/line/visline.cpp index d9c3f3791..b193352a0 100644 --- a/src/libs/vtools/visualization/line/visline.cpp +++ b/src/libs/vtools/visualization/line/visline.cpp @@ -28,7 +28,6 @@ #include "visline.h" -#include #include #include #include @@ -37,6 +36,7 @@ #include "../ifc/ifcdef.h" #include "../vgeometry/vgobject.h" #include "../vmisc/vabstractapplication.h" +#include "../vmisc/vmath.h" #include "../vpatterndb/vcontainer.h" class QPointF; diff --git a/src/libs/vtools/visualization/line/vistooltriangle.cpp b/src/libs/vtools/visualization/line/vistooltriangle.cpp index 6eebec560..71feb80c0 100644 --- a/src/libs/vtools/visualization/line/vistooltriangle.cpp +++ b/src/libs/vtools/visualization/line/vistooltriangle.cpp @@ -28,7 +28,6 @@ #include "vistooltriangle.h" -#include #include #include #include @@ -41,6 +40,7 @@ #include "../ifc/ifcdef.h" #include "../vgeometry/vpointf.h" #include "../vmisc/vabstractapplication.h" +#include "../vmisc/vmath.h" #include "../vpatterndb/vcontainer.h" #include "../visualization.h" #include "visline.h" diff --git a/src/libs/vwidgets/vmaingraphicsview.cpp b/src/libs/vwidgets/vmaingraphicsview.cpp index 94569f451..fc5584462 100644 --- a/src/libs/vwidgets/vmaingraphicsview.cpp +++ b/src/libs/vwidgets/vmaingraphicsview.cpp @@ -28,7 +28,6 @@ #include "vmaingraphicsview.h" -#include #include #include #include @@ -48,6 +47,7 @@ #include #include "../vmisc/def.h" +#include "../vmisc/vmath.h" #include "vmaingraphicsscene.h" #include "vsimplecurve.h"