1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warnings about lossy double/float conversion in tests

Browse Source 
QVectorND, QQuaternion, and QColor all operate on floats rather than
qreal or double, so explicit use float literals in the tests.

Pick-to: 6.1
Change-Id: If12cc12ddd9cd8219f3d78bf24e1400921e26c2b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Volker Hilsheimer 2021-04-11 15:19:26 +02:00
parent 7266bd459e
commit 65e3dc5eac
4 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp
View File

@ -905,7 +905,7 @@ void tst_QQuaternion::fromAxes_data()
QTest::newRow("complex")
<< 1.0f << 2.0f << -3.0f << 45.0f
<< QVector3D(0.728028, -0.525105, -0.440727) << QVector3D(0.608789, 0.790791, 0.0634566) << QVector3D(0.315202, -0.314508, 0.895395);
<< QVector3D(0.728028f, -0.525105f, -0.440727f) << QVector3D(0.608789f, 0.790791f, 0.0634566f) << QVector3D(0.315202f, -0.314508f, 0.895395f);
}
void tst_QQuaternion::fromAxes()
{

94
tests/auto/gui/painting/qcolor/tst_qcolor.cpp
View File

@ -139,11 +139,11 @@ void tst_QColor::getSetCheck()
// void QColor::setAlphaF(float)
obj1.setAlphaF(0.0);
QCOMPARE(obj1.alphaF(), 0.0f); // range<0.0, 1.0>
obj1.setAlphaF(-0.2);
obj1.setAlphaF(-0.2f);
QCOMPARE(obj1.alphaF(), 0.0f); // range<0.0, 1.0>
obj1.setAlphaF(1.0);
obj1.setAlphaF(1.0f);
QCOMPARE(obj1.alphaF(), 1.0f); // range<0.0, 1.0>
obj1.setAlphaF(1.1);
obj1.setAlphaF(1.1f);
QCOMPARE(obj1.alphaF(), 1.0f); // range<0.0, 1.0>
// int QColor::red()
@ -1421,58 +1421,58 @@ void tst_QColor::toRgb_data()
QTest::addColumn<QColor>("hslColor");
QTest::newRow("black")
<< QColor::fromRgbF(0.0, 0.0, 0.0)
<< QColor::fromHsvF(-1.0, 0.0, 0.0)
<< QColor::fromCmykF(0.0, 0.0, 0.0, 1.0)
<< QColor::fromHslF(-1.0, 0.0, 0.0);
<< QColor::fromRgbF(0.0f, 0.0f, 0.0f)
<< QColor::fromHsvF(-1.0f, 0.0f, 0.0f)
<< QColor::fromCmykF(0.0f, 0.0f, 0.0f, 1.0f)
<< QColor::fromHslF(-1.0f, 0.0f, 0.0f);
QTest::newRow("white")
<< QColor::fromRgbF(1.0, 1.0, 1.0)
<< QColor::fromHsvF(-1.0, 0.0, 1.0)
<< QColor::fromCmykF(0.0, 0.0, 0.0, 0.0)
<< QColor::fromHslF(-1.0, 0.0, 1.0);
<< QColor::fromRgbF(1.0f, 1.0f, 1.0f)
<< QColor::fromHsvF(-1.0f, 0.0f, 1.0f)
<< QColor::fromCmykF(0.0f, 0.0f, 0.0f, 0.0f)
<< QColor::fromHslF(-1.0f, 0.0f, 1.0f);
QTest::newRow("red")
<< QColor::fromRgbF(1.0, 0.0, 0.0)
<< QColor::fromHsvF(0.0, 1.0, 1.0)
<< QColor::fromCmykF(0.0, 1.0, 1.0, 0.0)
<< QColor::fromHslF(0.0, 1.0, 0.5, 1.0);
<< QColor::fromRgbF(1.0f, 0.0f, 0.0f)
<< QColor::fromHsvF(0.0f, 1.0f, 1.0f)
<< QColor::fromCmykF(0.0f, 1.0f, 1.0f, 0.0f)
<< QColor::fromHslF(0.0f, 1.0f, 0.5f, 1.0f);
QTest::newRow("green")
<< QColor::fromRgbF(0.0, 1.0, 0.0)
<< QColor::fromHsvF(0.33333, 1.0, 1.0)
<< QColor::fromCmykF(1.0, 0.0, 1.0, 0.0)
<< QColor::fromHslF(0.33333, 1.0, 0.5);
<< QColor::fromRgbF(0.0f, 1.0f, 0.0f)
<< QColor::fromHsvF(0.33333f, 1.0f, 1.0f)
<< QColor::fromCmykF(1.0, 0.0f, 1.0f, 0.0f)
<< QColor::fromHslF(0.33333f, 1.0f, 0.5f);
QTest::newRow("blue")
<< QColor::fromRgbF(0.0, 0.0, 1.0)
<< QColor::fromHsvF(0.66667, 1.0, 1.0)
<< QColor::fromCmykF(1.0, 1.0, 0.0, 0.0)
<< QColor::fromHslF(0.66667, 1.0, 0.5);
<< QColor::fromRgbF(0.0f, 0.0f, 1.0f)
<< QColor::fromHsvF(0.66667f, 1.0f, 1.0f)
<< QColor::fromCmykF(1.0f, 1.0f, 0.0f, 0.0f)
<< QColor::fromHslF(0.66667f, 1.0f, 0.5f);
QTest::newRow("cyan")
<< QColor::fromRgbF(0.0, 1.0, 1.0)
<< QColor::fromHsvF(0.5, 1.0, 1.0)
<< QColor::fromCmykF(1.0, 0.0, 0.0, 0.0)
<< QColor::fromHslF(0.5, 1.0, 0.5);
<< QColor::fromRgbF(0.0f, 1.0f, 1.0f)
<< QColor::fromHsvF(0.5f, 1.0f, 1.0f)
<< QColor::fromCmykF(1.0f, 0.0f, 0.0f, 0.0f)
<< QColor::fromHslF(0.5f, 1.0f, 0.5f);
QTest::newRow("magenta")
<< QColor::fromRgbF(1.0, 0.0, 1.0)
<< QColor::fromHsvF(0.83333, 1.0, 1.0)
<< QColor::fromCmykF(0.0, 1.0, 0.0, 0.0)
<< QColor::fromHslF(0.83333, 1.0, 0.5);
<< QColor::fromRgbF(1.0f, 0.0f, 1.0f)
<< QColor::fromHsvF(0.83333f, 1.0f, 1.0f)
<< QColor::fromCmykF(0.0f, 1.0f, 0.0f, 0.0f)
<< QColor::fromHslF(0.83333f, 1.0f, 0.5f);
QTest::newRow("yellow")
<< QColor::fromRgbF(1.0, 1.0, 0.0)
<< QColor::fromHsvF(0.16667, 1.0, 1.0)
<< QColor::fromCmykF(0.0, 0.0, 1.0, 0.0)
<< QColor::fromHslF(0.16667, 1.0, 0.5);
<< QColor::fromRgbF(1.0f, 1.0f, 0.0f)
<< QColor::fromHsvF(0.16667f, 1.0f, 1.0f)
<< QColor::fromCmykF(0.0f, 0.0f, 1.0f, 0.0f)
<< QColor::fromHslF(0.16667f, 1.0f, 0.5f);
QTest::newRow("gray")
<< QColor::fromRgbF(0.6431375, 0.6431375, 0.6431375)
<< QColor::fromHsvF(-1.0, 0.0, 0.6431375)
<< QColor::fromCmykF(0.0, 0.0, 0.0, 0.356863)
<< QColor::fromHslF(-1.0, 0.0, 0.6431375);
<< QColor::fromRgbF(0.6431375f, 0.6431375f, 0.6431375f)
<< QColor::fromHsvF(-1.0f, 0.0f, 0.6431375f)
<< QColor::fromCmykF(0.0f, 0.0f, 0.0f, 0.356863f)
<< QColor::fromHslF(-1.0f, 0.0f, 0.6431375f);
// ### add colors using the 0-255 functions
}
@ -1503,7 +1503,7 @@ void tst_QColor::toHsv_data()
<< QColor::fromHsv(300, 255, 255)
<< QColor(255, 0, 255)
<< QColor::fromCmyk(0, 255, 0, 0)
<< QColor::fromHslF(300./360., 1., 0.5, 1.0);
<< QColor::fromHslF(300.f/360.f, 1.f, 0.5f, 1.0f);
QTest::newRow("data1")
<< QColor::fromHsvF(1., 1., 1., 1.)
@ -1514,7 +1514,7 @@ void tst_QColor::toHsv_data()
void tst_QColor::toRgbNonDestructive()
{
QColor aColor = QColor::fromRgbF(0.11, 0.22, 0.33, 0.44);
QColor aColor = QColor::fromRgbF(0.11f, 0.22f, 0.33f, 0.44f);
QCOMPARE(aColor, aColor.toRgb());
}
@ -1534,7 +1534,7 @@ void tst_QColor::toHsv()
void tst_QColor::toHsvNonDestructive()
{
QColor aColor = QColor::fromHsvF(0.11, 0.22, 0.33, 0.44);
QColor aColor = QColor::fromHsvF(0.11f, 0.22f, 0.33f, 0.44f);
QCOMPARE(aColor, aColor.toHsv());
}
@ -1546,7 +1546,7 @@ void tst_QColor::toCmyk_data()
QTest::addColumn<QColor>("hslColor");
QTest::newRow("data0")
<< QColor::fromCmykF(1.0, 0.0, 0.0, 0.0)
<< QColor::fromCmykF(1.0f, 0.0f, 0.0f, 0.0f)
<< QColor(0, 255, 255)
<< QColor::fromHsv(180, 255, 255)
<< QColor::fromHslF(180./360., 1., 0.5, 1.0);
@ -1574,7 +1574,7 @@ void tst_QColor::toCmyk()
void tst_QColor::toCmykNonDestructive()
{
QColor aColor = QColor::fromCmykF(0.11, 0.22, 0.33, 0.44);
QColor aColor = QColor::fromCmykF(0.11f, 0.22f, 0.33f, 0.44f);
QCOMPARE(aColor, aColor.toCmyk());
}
@ -1587,13 +1587,13 @@ void tst_QColor::toHsl_data()
QTest::newRow("data0")
<< QColor::fromHslF(300./360., 1., 0.5, 1.0)
<< QColor::fromHslF(300.f/360.f, 1., 0.5f, 1.0)
<< QColor::fromHsv(300, 255, 255)
<< QColor(255, 0, 255)
<< QColor::fromCmyk(0, 255, 0, 0);
QTest::newRow("data1")
<< QColor::fromHslF(1., 1., 0.5, 1.0)
<< QColor::fromHslF(1., 1., 0.5f, 1.0)
<< QColor::fromHsvF(1., 1., 1., 1.)
<< QColor(255, 0, 0, 255)
<< QColor::fromCmykF(0., 1., 1., 0.);
@ -1618,7 +1618,7 @@ void tst_QColor::toHsl()
void tst_QColor::toHslNonDestructive()
{
QColor aColor = QColor::fromHslF(0.11, 0.22, 0.33, 0.44);
QColor aColor = QColor::fromHslF(0.11f, 0.22f, 0.33f, 0.44f);
QCOMPARE(aColor, aColor.toHsl());
}

10
tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
View File

@ -449,11 +449,11 @@ void tst_QColorSpace::loadImage()
void tst_QColorSpace::primaries()
{
QColor black = QColor::fromRgbF(0.0, 0.0, 0.0);
QColor white = QColor::fromRgbF(1.0, 1.0, 1.0);
QColor red = QColor::fromRgbF(1.0, 0.0, 0.0);
QColor green = QColor::fromRgbF(0.0, 1.0, 0.0);
QColor blue = QColor::fromRgbF(0.0, 0.0, 1.0);
QColor black = QColor::fromRgbF(0.0f, 0.0f, 0.0f);
QColor white = QColor::fromRgbF(1.0f, 1.0f, 1.0f);
QColor red = QColor::fromRgbF(1.0f, 0.0f, 0.0f);
QColor green = QColor::fromRgbF(0.0f, 1.0f, 0.0f);
QColor blue = QColor::fromRgbF(0.0f, 0.0f, 1.0f);
QColorTransform toAdobeRgb = QColorSpace(QColorSpace::SRgb).transformationToColorSpace(QColorSpace::AdobeRgb);

4
tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
View File

@ -844,11 +844,11 @@ void tst_QCssParser::colorValue_data()
QTest::newRow("hsva") << "color: hsva(10, 20, 30, 40)" << QColor::fromHsv(10, 20, 30, 40);
// the percent and float values are well chosen to not get in trouble due to rounding errors
QTest::newRow("hsva-percent") << "color: hsva(100%, 20%, 40%, 60%)" << QColor::fromHsv(359, 51, 102, 153);
QTest::newRow("hsva-float") << "color: hsva(180, 20%, 40%, 0.6)" << QColor::fromHsvF(0.5, 0.2, 0.4, 0.6);
QTest::newRow("hsva-float") << "color: hsva(180, 20%, 40%, 0.6)" << QColor::fromHsvF(0.5f, 0.2f, 0.4f, 0.6f);
QTest::newRow("hsl") << "color: hsl(60, 100%, 50%)" << QColor::fromHsl(60., 255, 127);
QTest::newRow("hsla") << "color: hsla(240, 255, 127, 192)" << QColor::fromHsl(240, 255, 127, 192);
QTest::newRow("hsla-percent") << "color: hsla(100%, 80%, 40%, 0%)" << QColor::fromHsl(359, 204, 102, 0);
QTest::newRow("hsla-float") << "color: hsla(252, 40%, 60%, 0.2)" << QColor::fromHslF(0.7, 0.4, 0.6, 0.2);
QTest::newRow("hsla-float") << "color: hsla(252, 40%, 60%, 0.2)" << QColor::fromHslF(0.7f, 0.4f, 0.6f, 0.2f);
QTest::newRow("invalid1") << "color: rgb(why, does, it, always, rain, on, me)" << QColor();
QTest::newRow("invalid2") << "color: rgba(i, meant, norway)" << QColor();
QTest::newRow("invalid3") << "color: rgb(21)" << QColor();