aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-08-16 19:57:32 +03:00
parent 222bbeaa75
commit d66280033b
36 changed files with 43 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/valentina/core/vapplication.cpp
View File

@ -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>

7
src/app/valentina/dialogs/dialoglayoutsettings.cpp
View File

@ -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 <QtMath>
#endif
#include "../vmisc/vmath.h"
#include <QMessageBox>
#include <QPushButton>

2
src/app/valentina/xml/vpattern.cpp
View File

@ -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");

3
src/libs/qmuparser/qmuparser.cpp
View File

@ -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;

6
src/libs/qmuparser/qmuparserbase.cpp
View File

@ -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;
/**

2
src/libs/qmuparser/qmuparserbytecode.cpp
View File

@ -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
{

2
src/libs/qmuparser/qmuparsertest.cpp
View File

@ -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;

5
src/libs/vdxf/dxflib/dl_extrusion.h
View File

@ -27,8 +27,7 @@
#include "dl_global.h"
#include <math.h>
#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];

7
src/libs/vdxf/vdxfengine.cpp
View File

@ -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()
{

2
src/libs/vgeometry/vabstractcubicbezier.cpp
View File

@ -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"
//---------------------------------------------------------------------------------------------------------------------

2
src/libs/vgeometry/varc.cpp
View File

@ -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"

2
src/libs/vgeometry/vcubicbezier_p.h
View File

@ -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++")

7
src/libs/vgeometry/vcubicbezierpath.cpp
View File

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

3
src/libs/vgeometry/vellipticalarc.cpp
View File

@ -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"

3
src/libs/vgeometry/vgobject.cpp
View File

@ -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"

2
src/libs/vgeometry/vspline.cpp
View File

@ -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;

2
src/libs/vgeometry/vspline_p.h
View File

@ -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++")

6
src/libs/vgeometry/vsplinepath.cpp
View File

@ -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.

7
src/libs/vlayout/vcontour.cpp
View File

@ -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"
#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
# include "../vmisc/vmath.h"
#else
#endif
#include "../vmisc/vmath.h"
//---------------------------------------------------------------------------------------------------------------------
VContour::VContour()

10
src/libs/vlayout/vlayoutdetail.cpp
View File

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

2
src/libs/vlayout/vlayoutgenerator.cpp
View File

@ -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"

7
src/libs/vlayout/vposition.cpp
View File

@ -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"
#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,

7
src/libs/vlayout/vposter.cpp
View File

@ -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"
#else
#endif
#include "../vmisc/vmath.h"
#include "../vmisc/def.h"
//---------------------------------------------------------------------------------------------------------------------

6
src/libs/vmisc/vcommonsettings.cpp
View File

@ -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");

8
src/libs/vmisc/vmath.h
View File

@ -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 <QtMath>
#else
#if 0
#pragma qt_class(QtMath)

6
src/libs/vmisc/vsettings.cpp
View File

@ -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");

7
src/libs/vobj/vobjengine.cpp
View File

@ -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 */

7
src/libs/vpatterndb/variables/vlineangle.cpp
View File

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

6
src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp
View File

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

8
src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp
View File

@ -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");

8
src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp
View File

@ -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");

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp
View File

@ -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;

3
src/libs/vtools/tools/vtextgraphicsitem.cpp
View File

@ -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;

2
src/libs/vtools/visualization/line/visline.cpp
View File

@ -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;

2
src/libs/vtools/visualization/line/vistooltriangle.cpp
View File

@ -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"

2
src/libs/vwidgets/vmaingraphicsview.cpp
View File

@ -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"