From ade888860334d207f5f070b0bc9c4c98deaf3862 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Sun, 29 Apr 2012 00:11:28 -0700 Subject: Don't use obsolete qVariantValue, qVariantCanConvert, etc. qVariantValue and qVariantCanConvert are Compatibility members, while in Qt4.8 they are marked as Qt 3 Support Members. qVariantFromValue and qVariantSetValue are Obsolete members. Change-Id: Ie8505cad1e0950e40c6f6710fde9f6fb2ac670fd Reviewed-by: Friedemann Kleint --- tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp | 6 +++--- tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp | 6 +++--- tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp | 6 +++--- tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp | 18 +++++++++--------- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp index 7f41f0651e..466764f81e 100644 --- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp +++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp @@ -158,7 +158,7 @@ void tst_QClipboard::testSignals() QCOMPARE(selectionChangedSpy.count(), 0); QCOMPARE(changedSpy.count(), 1); QCOMPARE(changedSpy.at(0).count(), 1); - QCOMPARE(qVariantValue(changedSpy.at(0).at(0)), QClipboard::Clipboard); + QCOMPARE(qvariant_cast(changedSpy.at(0).at(0)), QClipboard::Clipboard); changedSpy.clear(); @@ -168,7 +168,7 @@ void tst_QClipboard::testSignals() QCOMPARE(selectionChangedSpy.count(), 1); QCOMPARE(changedSpy.count(), 1); QCOMPARE(changedSpy.at(0).count(), 1); - QCOMPARE(qVariantValue(changedSpy.at(0).at(0)), QClipboard::Selection); + QCOMPARE(qvariant_cast(changedSpy.at(0).at(0)), QClipboard::Selection); } else { QCOMPARE(selectionChangedSpy.count(), 0); } @@ -183,7 +183,7 @@ void tst_QClipboard::testSignals() QCOMPARE(searchChangedSpy.count(), 1); QCOMPARE(changedSpy.count(), 1); QCOMPARE(changedSpy.at(0).count(), 1); - QCOMPARE(qVariantValue(changedSpy.at(0).at(0)), QClipboard::FindBuffer); + QCOMPARE(qvariant_cast(changedSpy.at(0).at(0)), QClipboard::FindBuffer); } else { QCOMPARE(searchChangedSpy.count(), 0); } diff --git a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp index 698470ac60..c89d10a543 100644 --- a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp +++ b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp @@ -3358,13 +3358,13 @@ void tst_QMatrixNxN::properties() QMatrix4x4 m1(uniqueValues4); obj.setMatrix(m1); - QMatrix4x4 m2 = qVariantValue(obj.property("matrix")); + QMatrix4x4 m2 = qvariant_cast(obj.property("matrix")); QVERIFY(isSame(m2, uniqueValues4)); QMatrix4x4 m3(transposedValues4); - obj.setProperty("matrix", qVariantFromValue(m3)); + obj.setProperty("matrix", QVariant::fromValue(m3)); - m2 = qVariantValue(obj.property("matrix")); + m2 = qvariant_cast(obj.property("matrix")); QVERIFY(isSame(m2, transposedValues4)); } diff --git a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp index 1690afcac4..a4e1f940fc 100644 --- a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp +++ b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp @@ -855,16 +855,16 @@ void tst_QQuaternion::properties() obj.setQuaternion(QQuaternion(6.0f, 7.0f, 8.0f, 9.0f)); - QQuaternion q = qVariantValue(obj.property("quaternion")); + QQuaternion q = qvariant_cast(obj.property("quaternion")); QCOMPARE(q.scalar(), (qreal)6.0f); QCOMPARE(q.x(), (qreal)7.0f); QCOMPARE(q.y(), (qreal)8.0f); QCOMPARE(q.z(), (qreal)9.0f); obj.setProperty("quaternion", - qVariantFromValue(QQuaternion(-6.0f, -7.0f, -8.0f, -9.0f))); + QVariant::fromValue(QQuaternion(-6.0f, -7.0f, -8.0f, -9.0f))); - q = qVariantValue(obj.property("quaternion")); + q = qvariant_cast(obj.property("quaternion")); QCOMPARE(q.scalar(), (qreal)-6.0f); QCOMPARE(q.x(), (qreal)-7.0f); QCOMPARE(q.y(), (qreal)-8.0f); diff --git a/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp b/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp index 067773074e..72a4ecef97 100644 --- a/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp +++ b/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp @@ -2077,38 +2077,38 @@ void tst_QVectorND::properties() obj.setVector3D(QVector3D(3.0f, 4.0f, 5.0f)); obj.setVector4D(QVector4D(6.0f, 7.0f, 8.0f, 9.0f)); - QVector2D v2 = qVariantValue(obj.property("vector2D")); + QVector2D v2 = qvariant_cast(obj.property("vector2D")); QCOMPARE(v2.x(), (qreal)1.0f); QCOMPARE(v2.y(), (qreal)2.0f); - QVector3D v3 = qVariantValue(obj.property("vector3D")); + QVector3D v3 = qvariant_cast(obj.property("vector3D")); QCOMPARE(v3.x(), (qreal)3.0f); QCOMPARE(v3.y(), (qreal)4.0f); QCOMPARE(v3.z(), (qreal)5.0f); - QVector4D v4 = qVariantValue(obj.property("vector4D")); + QVector4D v4 = qvariant_cast(obj.property("vector4D")); QCOMPARE(v4.x(), (qreal)6.0f); QCOMPARE(v4.y(), (qreal)7.0f); QCOMPARE(v4.z(), (qreal)8.0f); QCOMPARE(v4.w(), (qreal)9.0f); obj.setProperty("vector2D", - qVariantFromValue(QVector2D(-1.0f, -2.0f))); + QVariant::fromValue(QVector2D(-1.0f, -2.0f))); obj.setProperty("vector3D", - qVariantFromValue(QVector3D(-3.0f, -4.0f, -5.0f))); + QVariant::fromValue(QVector3D(-3.0f, -4.0f, -5.0f))); obj.setProperty("vector4D", - qVariantFromValue(QVector4D(-6.0f, -7.0f, -8.0f, -9.0f))); + QVariant::fromValue(QVector4D(-6.0f, -7.0f, -8.0f, -9.0f))); - v2 = qVariantValue(obj.property("vector2D")); + v2 = qvariant_cast(obj.property("vector2D")); QCOMPARE(v2.x(), (qreal)-1.0f); QCOMPARE(v2.y(), (qreal)-2.0f); - v3 = qVariantValue(obj.property("vector3D")); + v3 = qvariant_cast(obj.property("vector3D")); QCOMPARE(v3.x(), (qreal)-3.0f); QCOMPARE(v3.y(), (qreal)-4.0f); QCOMPARE(v3.z(), (qreal)-5.0f); - v4 = qVariantValue(obj.property("vector4D")); + v4 = qvariant_cast(obj.property("vector4D")); QCOMPARE(v4.x(), (qreal)-6.0f); QCOMPARE(v4.y(), (qreal)-7.0f); QCOMPARE(v4.z(), (qreal)-8.0f); -- cgit v1.2.3