diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2017-09-22 00:02:16 -0700 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-10-29 10:13:23 +0000 |
commit | fb5976038162d93d60c7f76376bbb4df38e83ba9 (patch) | |
tree | 6ea5ee808422fe7dee70590dd5348961eda0d047 /src/gui/math3d | |
parent | 0e0f656f5031585c6b691d80057dfdc00bc48400 (diff) |
Fix GCC -Wfloat-conversion warnings (available since GCC 4.9)
This warning used to be part of -Wconversion, but that generates too
more noise than we're willing to fix now (like conversion from qint64 to
int). The float conversion does trigger for conversion from double to
float, as shown in all the QVectorND uses of float, but more
importantly, it triggers on passing floats to ints.
Change-Id: I69f37f9304f24709a823fffd14e69cfd33f75988
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/gui/math3d')
-rw-r--r-- | src/gui/math3d/qmatrix4x4.h | 6 | ||||
-rw-r--r-- | src/gui/math3d/qquaternion.h | 4 | ||||
-rw-r--r-- | src/gui/math3d/qvector2d.h | 2 | ||||
-rw-r--r-- | src/gui/math3d/qvector3d.h | 2 | ||||
-rw-r--r-- | src/gui/math3d/qvector4d.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h index 4db96d07c0..97df11a8bd 100644 --- a/src/gui/math3d/qmatrix4x4.h +++ b/src/gui/math3d/qmatrix4x4.h @@ -859,8 +859,8 @@ inline QPointF operator*(const QPointF& point, const QMatrix4x4& matrix) { float xin, yin; float x, y, w; - xin = point.x(); - yin = point.y(); + xin = float(point.x()); + yin = float(point.y()); x = xin * matrix.m[0][0] + yin * matrix.m[0][1] + matrix.m[0][3]; @@ -1094,7 +1094,7 @@ inline float *QMatrix4x4::data() inline void QMatrix4x4::viewport(const QRectF &rect) { - viewport(rect.x(), rect.y(), rect.width(), rect.height()); + viewport(float(rect.x()), float(rect.y()), float(rect.width()), float(rect.height())); } QT_WARNING_POP diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h index 7f7f89db4d..cd0d746e55 100644 --- a/src/gui/math3d/qquaternion.h +++ b/src/gui/math3d/qquaternion.h @@ -210,8 +210,8 @@ inline QQuaternion QQuaternion::inverted() const double(yp) * double(yp) + double(zp) * double(zp); if (!qFuzzyIsNull(len)) - return QQuaternion(double(wp) / len, double(-xp) / len, - double(-yp) / len, double(-zp) / len); + return QQuaternion(float(double(wp) / len), float(double(-xp) / len), + float(double(-yp) / len), float(double(-zp) / len)); return QQuaternion(0.0f, 0.0f, 0.0f, 0.0f); } diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h index 5e0394b998..2af5132665 100644 --- a/src/gui/math3d/qvector2d.h +++ b/src/gui/math3d/qvector2d.h @@ -137,7 +137,7 @@ Q_DECL_CONSTEXPR inline QVector2D::QVector2D(float xpos, float ypos) : xp(xpos), Q_DECL_CONSTEXPR inline QVector2D::QVector2D(const QPoint& point) : xp(point.x()), yp(point.y()) {} -Q_DECL_CONSTEXPR inline QVector2D::QVector2D(const QPointF& point) : xp(point.x()), yp(point.y()) {} +Q_DECL_CONSTEXPR inline QVector2D::QVector2D(const QPointF& point) : xp(float(point.x())), yp(float(point.y())) {} inline bool QVector2D::isNull() const { diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h index a728fd76bf..f3e8c976b7 100644 --- a/src/gui/math3d/qvector3d.h +++ b/src/gui/math3d/qvector3d.h @@ -154,7 +154,7 @@ Q_DECL_CONSTEXPR inline QVector3D::QVector3D() : xp(0.0f), yp(0.0f), zp(0.0f) {} Q_DECL_CONSTEXPR inline QVector3D::QVector3D(const QPoint& point) : xp(point.x()), yp(point.y()), zp(0.0f) {} -Q_DECL_CONSTEXPR inline QVector3D::QVector3D(const QPointF& point) : xp(point.x()), yp(point.y()), zp(0.0f) {} +Q_DECL_CONSTEXPR inline QVector3D::QVector3D(const QPointF& point) : xp(float(point.x())), yp(float(point.y())), zp(0.0f) {} inline bool QVector3D::isNull() const { diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h index be373aa806..3f14b41e8e 100644 --- a/src/gui/math3d/qvector4d.h +++ b/src/gui/math3d/qvector4d.h @@ -146,7 +146,7 @@ Q_DECL_CONSTEXPR inline QVector4D::QVector4D(float xpos, float ypos, float zpos, Q_DECL_CONSTEXPR inline QVector4D::QVector4D(const QPoint& point) : xp(point.x()), yp(point.y()), zp(0.0f), wp(0.0f) {} -Q_DECL_CONSTEXPR inline QVector4D::QVector4D(const QPointF& point) : xp(point.x()), yp(point.y()), zp(0.0f), wp(0.0f) {} +Q_DECL_CONSTEXPR inline QVector4D::QVector4D(const QPointF& point) : xp(float(point.x())), yp(float(point.y())), zp(0.0f), wp(0.0f) {} inline bool QVector4D::isNull() const { |