Fixed issue #546. Compile error under Windows in current develop revision.

--HG--
branch : develop

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 <QProcess>
 #include <QTemporaryFile>
 #include <QUndoStack>
-#include <QtCore/qmath.h>
 #include <QTemporaryFile>
 #include <QFile>
 #include <QStandardPaths>

src/app/valentina/dialogs/dialoglayoutsettings.cpp

@@ -31,12 +31,7 @@
 #include "../core/vapplication.h"
 #include "../ifc/xml/vdomdocument.h"
 #include "../vmisc/vsettings.h"
-
+#include "../vmisc/vmath.h"
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-#   include "../vmisc/vmath.h"
-#else
-#   include <QtMath>
-#endif
 
 #include <QMessageBox>
 #include <QPushButton>

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 <QMessageBox>
 #include <QUndoStack>
-#include <QtCore/qmath.h>
 #include <QtNumeric>
 
 const QString VPattern::AttrReadOnly = QStringLiteral("readOnly");

src/libs/qmuparser/qmuparser.cpp

@@ -21,8 +21,6 @@
 
 #include "qmuparser.h"
 
-#include <QtCore/qmath.h>
-#include <math.h>
 #include <QCoreApplication>
 #include <QStaticStringData>
 #include <QStringData>
@@ -33,6 +31,7 @@
 
 #include "qmuparserdef.h"
 #include "qmuparsererror.h"
+#include "../vmisc/vmath.h"
 
 using namespace std;
 

src/libs/qmuparser/qmuparserbase.cpp

@@ -29,14 +29,14 @@
 #include <QTextStream>
 #include <QtDebug>
 #include <map>
-
-#include "qmudef.h"
 #ifdef QMUP_USE_OPENMP
     #include <omp.h>
 #endif
-#include <QtCore/qmath.h>
 #include <assert.h>
 
+#include "qmudef.h"
+#include "../vmisc/vmath.h"
+
 using namespace std;
 
 /**

src/libs/qmuparser/qmuparserbytecode.cpp

@@ -21,7 +21,6 @@
 
 #include "qmuparserbytecode.h"
 
-#include <QtCore/qmath.h>
 #include <assert.h>
 #include <QDebug>
 #include <QMessageLogger>
@@ -31,6 +30,7 @@
 
 #include "qmudef.h"
 #include "qmuparsererror.h"
+#include "../vmisc/vmath.h"
 
 namespace qmu
 {

src/libs/qmuparser/qmuparsertest.cpp

@@ -21,7 +21,6 @@
 
 #include "qmuparsertest.h"
 
-#include <math.h>
 #include <stdio.h>
 #include <QChar>
 #include <QCoreApplication>
@@ -41,6 +40,7 @@
 #include "qmudef.h"
 #include "qmuparser.h"
 #include "qmuparsererror.h"
+#include "../vmisc/vmath.h"
 
 using namespace std;
 

src/libs/vdxf/dxflib/dl_extrusion.h

@@ -27,8 +27,7 @@
 
 #include "dl_global.h"
 
-#include <math.h>
+#include "../vmisc/vmath.h"
-
 
 /**
  * Storing and passing around attributes. Attributes

src/libs/vdxf/vdxfengine.cpp

@@ -28,7 +28,6 @@
 
 #include "vdxfengine.h"
 
-#include <math.h>
 #include <QByteArray>
 #include <QColor>
 #include <QDateTime>
@@ -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()
 {

src/libs/vgeometry/vabstractcubicbezier.cpp

@@ -28,7 +28,6 @@
 
 #include "vabstractcubicbezier.h"
 
-#include <math.h>
 #include <QDebug>
 #include <QLineF>
 #include <QMessageLogger>
@@ -36,6 +35,7 @@
 #include <QtDebug>
 
 #include "../vmisc/def.h"
+#include "../vmisc/vmath.h"
 #include "../vgeometry/vpointf.h"
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vgeometry/varc.cpp

@@ -28,11 +28,11 @@
 
 #include "varc.h"
 
-#include <QtCore/qmath.h>
 #include <QLineF>
 #include <QPointF>
 
 #include "../vmisc/def.h"
+#include "../vmisc/vmath.h"
 #include "../ifc/ifcdef.h"
 #include "vabstractcurve.h"
 #include "varc_p.h"

src/libs/vgeometry/vcubicbezier_p.h

@@ -31,11 +31,11 @@
 
 #include <QSharedData>
 #include <QLineF>
-#include <QtCore/qmath.h>
 
 #include "vpointf.h"
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/diagnostic.h"
+#include "../vmisc/vmath.h"
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")

src/libs/vgeometry/vcubicbezierpath.cpp

@@ -28,21 +28,16 @@
 
 #include "vcubicbezierpath.h"
 
-#include <qmath.h>
 #include <QLineF>
 #include <QPoint>
 
 #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),

src/libs/vgeometry/vellipticalarc.cpp

@@ -28,12 +28,11 @@
 
 #include "vellipticalarc.h"
 
-#include <QtCore/qmath.h>
-#include <math.h>
 #include <QLineF>
 #include <QPoint>
 
 #include "../vmisc/def.h"
+#include "../vmisc/vmath.h"
 #include "../ifc/ifcdef.h"
 #include "../vmisc/vabstractapplication.h"
 #include "vabstractcurve.h"

src/libs/vgeometry/vgobject.cpp

@@ -28,8 +28,6 @@
 
 #include "vgobject.h"
 
-#include <QtCore/qmath.h>
-#include <math.h>
 #include <QLine>
 #include <QLineF>
 #include <QPoint>
@@ -37,6 +35,7 @@
 #include <QRectF>
 
 #include "../vmisc/def.h"
+#include "../vmisc/vmath.h"
 #include "../ifc/ifcdef.h"
 #include "vgobject_p.h"
 

src/libs/vgeometry/vspline.cpp

@@ -28,11 +28,11 @@
 
 #include "vspline.h"
 
-#include <math.h>
 #include <QLineF>
 
 #include "vabstractcurve.h"
 #include "vspline_p.h"
+#include "../vmisc/vmath.h"
 
 class QPointF;
 

src/libs/vgeometry/vspline_p.h

@@ -31,10 +31,10 @@
 
 #include <QSharedData>
 #include <QLineF>
-#include <QtCore/qmath.h>
 
 #include "vpointf.h"
 #include "../vmisc/vabstractapplication.h"
+#include "../vmisc/vmath.h"
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")

src/libs/vgeometry/vsplinepath.cpp

@@ -31,14 +31,10 @@
 #include <QPoint>
 
 #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.

src/libs/vlayout/vcontour.cpp

@@ -28,7 +28,6 @@
 
 #include "vcontour.h"
 
-#include <qmath.h>
 #include <QLineF>
 #include <QPainterPath>
 #include <QPoint>
@@ -39,11 +38,7 @@
 
 #include "vcontour_p.h"
 #include "vlayoutdetail.h"
-
+#include "../vmisc/vmath.h"
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-#   include "../vmisc/vmath.h"
-#else
-#endif
 
 //---------------------------------------------------------------------------------------------------------------------
 VContour::VContour()

src/libs/vlayout/vlayoutdetail.cpp

@@ -28,8 +28,6 @@
 
 #include "vlayoutdetail.h"
 
-#include <math.h>
-#include <qmath.h>
 #include <QBrush>
 #include <QFlags>
 #include <QFont>
@@ -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 <QDebug>
-
 //---------------------------------------------------------------------------------------------------------------------
 VLayoutDetail::VLayoutDetail()
     :VAbstractDetail(), d(new VLayoutDetailData)

src/libs/vlayout/vlayoutgenerator.cpp

@@ -28,12 +28,12 @@
 
 #include "vlayoutgenerator.h"
 
-#include <QtCore/qmath.h>
 #include <QGraphicsRectItem>
 #include <QRectF>
 #include <QThreadPool>
 
 #include "../vmisc/def.h"
+#include "../vmisc/vmath.h"
 #include "vlayoutdetail.h"
 #include "vlayoutpaper.h"
 

src/libs/vlayout/vposition.cpp

@@ -28,7 +28,6 @@
 
 #include "vposition.h"
 
-#include <qmath.h>
 #include <QDir>
 #include <QImage>
 #include <QLineF>
@@ -48,11 +47,7 @@
 #include <Qt>
 
 #include "../vmisc/def.h"
-
+#include "../vmisc/vmath.h"
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-#   include "../vmisc/vmath.h"
-#else
-#endif
 
 //---------------------------------------------------------------------------------------------------------------------
 VPosition::VPosition(const VContour &gContour, int j, const VLayoutDetail &detail, int i, volatile bool *stop,

src/libs/vlayout/vposter.cpp

@@ -28,7 +28,6 @@
 
 #include "vposter.h"
 
-#include <qmath.h>
 #include <QGraphicsLineItem>
 #include <QGraphicsPixmapItem>
 #include <QGraphicsTextItem>
@@ -40,11 +39,7 @@
 #include <QVector>
 #include <Qt>
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
+#include "../vmisc/vmath.h"
-#   include "../vmisc/vmath.h"
-#else
-#endif
-
 #include "../vmisc/def.h"
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vmisc/vcommonsettings.cpp

@@ -41,14 +41,10 @@
 #include <QtDebug>
 
 #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");

src/libs/vmisc/vmath.h

@@ -18,10 +18,12 @@
 **
 ****************************************************************************/
 
-#ifndef QMATH_H
+#ifndef VMATH_H
-#define QMATH_H
+#define VMATH_H
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
+#include <QtMath>
+#else
 
 #if 0
 #pragma qt_class(QtMath)

src/libs/vmisc/vsettings.cpp

@@ -39,14 +39,10 @@
 #include <QVariant>
 
 #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");

src/libs/vobj/vobjengine.cpp

@@ -28,7 +28,6 @@
 
 #include "vobjengine.h"
 
-#include <qmath.h>
 #include <QByteArray>
 #include <QDebug>
 #include <QFlag>
@@ -45,6 +44,7 @@
 #include <QtDebug>
 
 #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 <ciso646>
 #endif /* Q_CC_MSVC */

src/libs/vpatterndb/variables/vlineangle.cpp

@@ -28,23 +28,18 @@
 
 #include "vlineangle.h"
 
-#include <qmath.h>
 #include <QLineF>
 #include <QMessageLogger>
 #include <QPointF>
 #include <QString>
 
 #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)

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),

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

@@ -28,8 +28,6 @@
 
 #include "vtoolspline.h"
 
-#include <math.h>
-#include <qmath.h>
 #include <QDomElement>
 #include <QEvent>
 #include <QFlags>
@@ -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");
 

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

@@ -28,8 +28,6 @@
 
 #include "vtoolsplinepath.h"
 
-#include <math.h>
-#include <qmath.h>
 #include <QDomElement>
 #include <QEvent>
 #include <QFlags>
@@ -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");
 

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

@@ -28,7 +28,6 @@
 
 #include "vtooltriangle.h"
 
-#include <QtCore/qmath.h>
 #include <QLine>
 #include <QLineF>
 #include <QSharedPointer>
@@ -50,6 +49,7 @@
 #include "../../../vabstracttool.h"
 #include "../../vdrawtool.h"
 #include "vtoolsinglepoint.h"
+#include "../vmisc/vmath.h"
 
 class QDomElement;
 class QGraphicsSceneContextMenuEvent;

src/libs/vtools/tools/vtextgraphicsitem.cpp

@@ -26,8 +26,6 @@
  **
  *************************************************************************/
 
-#include <math.h>
-#include <qmath.h>
 #include <QColor>
 #include <QFlags>
 #include <QFont>
@@ -41,6 +39,7 @@
 #include <Qt>
 
 #include "../vmisc/def.h"
+#include "../vmisc/vmath.h"
 #include "vtextgraphicsitem.h"
 
 class QGraphicsSceneHoverEvent;

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

@@ -28,7 +28,6 @@
 
 #include "visline.h"
 
-#include <QtCore/qmath.h>
 #include <QGraphicsScene>
 #include <QGuiApplication>
 #include <QPen>
@@ -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;

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

@@ -28,7 +28,6 @@
 
 #include "vistooltriangle.h"
 
-#include <QtCore/qmath.h>
 #include <QGraphicsLineItem>
 #include <QGraphicsPathItem>
 #include <QPainterPath>
@@ -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"

src/libs/vwidgets/vmaingraphicsview.cpp

@@ -28,7 +28,6 @@
 
 #include "vmaingraphicsview.h"
 
-#include <qmath.h>
 #include <QApplication>
 #include <QCursor>
 #include <QEvent>
@@ -48,6 +47,7 @@
 #include <QWidget>
 
 #include "../vmisc/def.h"
+#include "../vmisc/vmath.h"
 #include "vmaingraphicsscene.h"
 #include "vsimplecurve.h"