whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup float-equal warnings 

Consistently use the macro from qcompilerdetection.h instead of manually
disabling the warning for three different compilers.

Change-Id: Id59d30047c8a504e1082d7e47c02f4746fddf9d6
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
Lars Knoll 2020-06-16 10:51:41 +02:00
parent 4d90725e77
commit a42dd2ffe0
11 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/global/qfloat16.h
View File

@ -242,9 +242,7 @@ QF16_MAKE_ARITH_OP_INT(/)
#undef QF16_MAKE_ARITH_OP_INT
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
QT_WARNING_DISABLE_GCC("-Wfloat-equal")
QT_WARNING_DISABLE_INTEL(1572)
QT_WARNING_DISABLE_FLOAT_COMPARE
inline bool operator>(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) > static_cast<float>(b); }
inline bool operator<(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) < static_cast<float>(b); }

4
src/corelib/global/qglobal.h
View File

@ -866,9 +866,7 @@ Q_REQUIRED_RESULT Q_DECL_CONSTEXPR static inline Q_DECL_UNUSED bool qFuzzyIsNul
}
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
QT_WARNING_DISABLE_GCC("-Wfloat-equal")
QT_WARNING_DISABLE_INTEL(1572)
QT_WARNING_DISABLE_FLOAT_COMPARE
Q_REQUIRED_RESULT Q_DECL_CONSTEXPR static inline Q_DECL_UNUSED bool qIsNull(double d) noexcept
{

3
src/corelib/global/qnumeric_p.h
View File

@ -240,8 +240,7 @@ template <typename T> static inline bool convertDoubleTo(double v, T *value, boo
*value = T(v);
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wfloat-equal")
QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
QT_WARNING_DISABLE_FLOAT_COMPARE
return *value == v;

4
src/corelib/tools/qpoint.h
View File

@ -349,9 +349,7 @@ constexpr inline QPointF &QPointF::operator*=(qreal c)
}
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
QT_WARNING_DISABLE_GCC("-Wfloat-equal")
QT_WARNING_DISABLE_INTEL(1572)
QT_WARNING_DISABLE_FLOAT_COMPARE
constexpr inline bool operator==(const QPointF &p1, const QPointF &p2)
{

4
src/corelib/tools/qrect.h
View File

@ -663,9 +663,7 @@ Q_DECL_CONSTEXPR inline QRectF::QRectF(const QRect &r) noexcept
}
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
QT_WARNING_DISABLE_GCC("-Wfloat-equal")
QT_WARNING_DISABLE_INTEL(1572)
QT_WARNING_DISABLE_FLOAT_COMPARE
Q_DECL_CONSTEXPR inline bool QRectF::isNull() const noexcept
{ return w == 0. && h == 0.; }

5
src/gui/math3d/qmatrix4x4.h
View File

@ -214,9 +214,8 @@ private:
Q_DECLARE_OPERATORS_FOR_FLAGS(QMatrix4x4::Flags)
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
QT_WARNING_DISABLE_GCC("-Wfloat-equal")
QT_WARNING_DISABLE_INTEL(1572)
QT_WARNING_DISABLE_FLOAT_COMPARE
Q_DECLARE_TYPEINFO(QMatrix4x4, Q_MOVABLE_TYPE);
inline QMatrix4x4::QMatrix4x4

5
src/gui/math3d/qquaternion.h
View File

@ -169,9 +169,8 @@ inline QQuaternion::QQuaternion() : wp(1.0f), xp(0.0f), yp(0.0f), zp(0.0f) {}
inline QQuaternion::QQuaternion(float aScalar, float xpos, float ypos, float zpos) : wp(aScalar), xp(xpos), yp(ypos), zp(zpos) {}
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
QT_WARNING_DISABLE_GCC("-Wfloat-equal")
QT_WARNING_DISABLE_INTEL(1572)
QT_WARNING_DISABLE_FLOAT_COMPARE
inline bool QQuaternion::isNull() const
{
return wp == 0.0f && xp == 0.0f && yp == 0.0f && zp == 0.0f;

5
src/gui/math3d/qvector2d.h
View File

@ -205,9 +205,8 @@ inline QVector2D &QVector2D::operator/=(const QVector2D &vector)
}
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
QT_WARNING_DISABLE_GCC("-Wfloat-equal")
QT_WARNING_DISABLE_INTEL(1572)
QT_WARNING_DISABLE_FLOAT_COMPARE
Q_DECL_CONSTEXPR inline bool operator==(const QVector2D &v1, const QVector2D &v2)
{
return v1.v[0] == v2.v[0] && v1.v[1] == v2.v[1];

5
src/gui/math3d/qvector3d.h
View File

@ -230,9 +230,8 @@ inline QVector3D &QVector3D::operator/=(const QVector3D &vector)
}
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
QT_WARNING_DISABLE_GCC("-Wfloat-equal")
QT_WARNING_DISABLE_INTEL(1572)
QT_WARNING_DISABLE_FLOAT_COMPARE
Q_DECL_CONSTEXPR inline bool operator==(const QVector3D &v1, const QVector3D &v2)
{
return v1.v[0] == v2.v[0] && v1.v[1] == v2.v[1] && v1.v[2] == v2.v[2];

5
src/gui/math3d/qvector4d.h
View File

@ -230,9 +230,8 @@ inline QVector4D &QVector4D::operator/=(const QVector4D &vector)
}
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
QT_WARNING_DISABLE_GCC("-Wfloat-equal")
QT_WARNING_DISABLE_INTEL(1572)
QT_WARNING_DISABLE_FLOAT_COMPARE
Q_DECL_CONSTEXPR inline bool operator==(const QVector4D &v1, const QVector4D &v2)
{
return v1.v[0] == v2.v[0] && v1.v[1] == v2.v[1] && v1.v[2] == v2.v[2] && v1.v[3] == v2.v[3];

4
src/gui/painting/qtransform.h
View File

@ -269,9 +269,7 @@ inline qreal QTransform::dy() const
}
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wfloat-equal")
QT_WARNING_DISABLE_GCC("-Wfloat-equal")
QT_WARNING_DISABLE_INTEL(1572)
QT_WARNING_DISABLE_FLOAT_COMPARE
inline QTransform &QTransform::operator*=(qreal num)
{