From 6766fcf138b7cec101cd0c7d3d9a7ac42f1bfe3a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 29 Jan 2014 08:44:33 +0100 Subject: Fix MSVC-warnings about double to float truncation. warning C4305: 'argument' : truncation fromm 'double' to 'float' Change-Id: I7e419700b26ff66c48562b73db74b45ab1673c23 Reviewed-by: Alan Alpert --- .../tst_qdeclarativeinstruction.cpp | 2 +- .../tst_qdeclarativelanguage.cpp | 2 +- .../tst_qdeclarativemetatype.cpp | 8 ++++---- .../qdeclarativeqt/tst_qdeclarativeqt.cpp | 4 ++-- .../declarative/qdeclarativevaluetypes/testtypes.h | 8 ++++---- .../tst_qdeclarativevaluetypes.cpp | 24 +++++++++++----------- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp index f37d4b6b..c95b1b54 100644 --- a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp +++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp @@ -133,7 +133,7 @@ void tst_qdeclarativeinstruction::dump() i.line = 6; i.type = QDeclarativeInstruction::StoreFloat; i.storeFloat.propertyIndex = 3; - i.storeFloat.value = 11.3; + i.storeFloat.value = 11.3f; data->bytecode << i; } diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index 4b4bab3f..9ddda6e7 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -549,7 +549,7 @@ void tst_qdeclarativelanguage::assignBasicTypes() QCOMPARE(object->rectFProperty(), QRectF((float)1000.1, (float)-10.9, (float)400, (float)90.99)); QCOMPARE(object->boolProperty(), true); QCOMPARE(object->variantProperty(), QVariant("Hello World!")); - QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2)); + QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2f)); QCOMPARE(object->urlProperty(), component.url().resolved(QUrl("main.qml"))); QVERIFY(object->objectProperty() != 0); MyTypeObject *child = qobject_cast(object->objectProperty()); diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp index 210e2c80..06ac857e 100644 --- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp +++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp @@ -253,10 +253,10 @@ void tst_qdeclarativemetatype::copy() QT_COPY_TEST(QMatrix, QMatrix().translate(10, 10)); QT_COPY_TEST(QTransform, QTransform().translate(10, 10)); QT_COPY_TEST(QMatrix4x4, QMatrix4x4(1,0,2,3,0,1,0,0,9,0,1,0,0,0,10,1)); - QT_COPY_TEST(QVector2D, QVector2D(10.2, 1)); - QT_COPY_TEST(QVector3D, QVector3D(10.2, 1, -2)); - QT_COPY_TEST(QVector4D, QVector4D(10.2, 1, -2, 1.2)); - QT_COPY_TEST(QQuaternion, QQuaternion(1.0, 10.2, 1, -2)); + QT_COPY_TEST(QVector2D, QVector2D(10.2f, 1)); + QT_COPY_TEST(QVector3D, QVector3D(10.2f, 1, -2)); + QT_COPY_TEST(QVector4D, QVector4D(10.2f, 1, -2, 1.2f)); + QT_COPY_TEST(QQuaternion, QQuaternion(1.0, 10.2f, 1, -2)); int voidValue; COPY_TEST(void *, VoidStar, (void *)&voidValue, (void *)0); diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index c7211861..3010cc98 100644 --- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp +++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp @@ -223,8 +223,8 @@ void tst_qdeclarativeqt::vector() QObject *object = component.create(); QVERIFY(object != 0); - QCOMPARE(qvariant_cast(object->property("test1")), QVector3D(1, 0, 0.9)); - QCOMPARE(qvariant_cast(object->property("test2")), QVector3D(102, -10, -982.1)); + QCOMPARE(qvariant_cast(object->property("test1")), QVector3D(1, 0, 0.9f)); + QCOMPARE(qvariant_cast(object->property("test2")), QVector3D(102, -10, -982.1f)); QCOMPARE(qvariant_cast(object->property("test3")), QVector3D()); QCOMPARE(qvariant_cast(object->property("test4")), QVector3D()); diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h index f0c752ce..3347a264 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h +++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h @@ -86,10 +86,10 @@ public: m_sizef(0.1, 100923.2), m_rect(2, 3, 109, 102), m_rectf(103.8, 99.2, 88.1, 77.6), - m_vector2(32.88, 1.3), - m_vector(23.88, 3.1, 4.3), - m_vector4(54.2, 23.88, 3.1, 4.3), - m_quaternion(4.3, 54.2, 23.88, 3.1), + m_vector2(32.88f, 1.3f), + m_vector(23.88f, 3.1f, 4.3f), + m_vector4(54.2f, 23.88f, 3.1f, 4.3f), + m_quaternion(4.3f, 54.2f, 23.88f, 3.1f), m_matrix(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16) { m_font.setFamily("Arial"); diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp index 740e1dcb..860069b8 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp +++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp @@ -323,7 +323,7 @@ void tst_qdeclarativevaluetypes::vector2d() QCOMPARE((float)object->property("v_x").toDouble(), (float)32.88); QCOMPARE((float)object->property("v_y").toDouble(), (float)1.3); - QCOMPARE(object->property("copy"), QVariant(QVector2D(32.88, 1.3))); + QCOMPARE(object->property("copy"), QVariant(QVector2D(32.88f, 1.3f))); delete object; } @@ -333,7 +333,7 @@ void tst_qdeclarativevaluetypes::vector2d() MyTypeObject *object = qobject_cast(component.create()); QVERIFY(object != 0); - QCOMPARE(object->vector2(), QVector2D(-0.3, -12.9)); + QCOMPARE(object->vector2(), QVector2D(-0.3f, -12.9f)); delete object; } @@ -349,7 +349,7 @@ void tst_qdeclarativevaluetypes::vector3d() QCOMPARE((float)object->property("v_x").toDouble(), (float)23.88); QCOMPARE((float)object->property("v_y").toDouble(), (float)3.1); QCOMPARE((float)object->property("v_z").toDouble(), (float)4.3); - QCOMPARE(object->property("copy"), QVariant(QVector3D(23.88, 3.1, 4.3))); + QCOMPARE(object->property("copy"), QVariant(QVector3D(23.88f, 3.1f, 4.3f))); delete object; } @@ -359,7 +359,7 @@ void tst_qdeclarativevaluetypes::vector3d() MyTypeObject *object = qobject_cast(component.create()); QVERIFY(object != 0); - QCOMPARE(object->vector(), QVector3D(-0.3, -12.9, 907.4)); + QCOMPARE(object->vector(), QVector3D(-0.3f, -12.9f, 907.4f)); delete object; } @@ -376,7 +376,7 @@ void tst_qdeclarativevaluetypes::vector4d() QCOMPARE((float)object->property("v_y").toDouble(), (float)23.88); QCOMPARE((float)object->property("v_z").toDouble(), (float)3.1); QCOMPARE((float)object->property("v_w").toDouble(), (float)4.3); - QCOMPARE(object->property("copy"), QVariant(QVector4D(54.2, 23.88, 3.1, 4.3))); + QCOMPARE(object->property("copy"), QVariant(QVector4D(54.2f, 23.88f, 3.1f, 4.3f))); delete object; } @@ -386,7 +386,7 @@ void tst_qdeclarativevaluetypes::vector4d() MyTypeObject *object = qobject_cast(component.create()); QVERIFY(object != 0); - QCOMPARE(object->vector4(), QVector4D(-0.3, -12.9, 907.4, 88.5)); + QCOMPARE(object->vector4(), QVector4D(-0.3f, -12.9f, 907.4f, 88.5f)); delete object; } @@ -403,7 +403,7 @@ void tst_qdeclarativevaluetypes::quaternion() QCOMPARE((float)object->property("v_x").toDouble(), (float)54.2); QCOMPARE((float)object->property("v_y").toDouble(), (float)23.88); QCOMPARE((float)object->property("v_z").toDouble(), (float)3.1); - QCOMPARE(object->property("copy"), QVariant(QQuaternion(4.3, 54.2, 23.88, 3.1))); + QCOMPARE(object->property("copy"), QVariant(QQuaternion(4.3f, 54.2f, 23.88f, 3.1f))); delete object; } @@ -413,7 +413,7 @@ void tst_qdeclarativevaluetypes::quaternion() MyTypeObject *object = qobject_cast(component.create()); QVERIFY(object != 0); - QCOMPARE(object->quaternion(), QQuaternion(88.5, -0.3, -12.9, 907.4)); + QCOMPARE(object->quaternion(), QQuaternion(88.5f, -0.3f, -12.9f, 907.4f)); delete object; } @@ -811,10 +811,10 @@ void tst_qdeclarativevaluetypes::cppClasses() CPP_TEST(QDeclarativeSizeFValueType, QSizeF(-100.7, 18.2)); CPP_TEST(QDeclarativeRectValueType, QRect(13, 39, 10928, 88)); CPP_TEST(QDeclarativeRectFValueType, QRectF(88.2, -90.1, 103.2, 118)); - CPP_TEST(QDeclarativeVector2DValueType, QVector2D(19.7, 1002)); - CPP_TEST(QDeclarativeVector3DValueType, QVector3D(18.2, 19.7, 1002)); - CPP_TEST(QDeclarativeVector4DValueType, QVector4D(18.2, 19.7, 1002, 54)); - CPP_TEST(QDeclarativeQuaternionValueType, QQuaternion(18.2, 19.7, 1002, 54)); + CPP_TEST(QDeclarativeVector2DValueType, QVector2D(19.7f, 1002)); + CPP_TEST(QDeclarativeVector3DValueType, QVector3D(18.2f, 19.7f, 1002)); + CPP_TEST(QDeclarativeVector4DValueType, QVector4D(18.2f, 19.7f, 1002, 54)); + CPP_TEST(QDeclarativeQuaternionValueType, QQuaternion(18.2f, 19.7f, 1002, 54)); CPP_TEST(QDeclarativeMatrix4x4ValueType, QMatrix4x4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); CPP_TEST(QDeclarativeFontValueType, QFont("Helvetica")); -- cgit v1.2.3