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/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp | 2 +- tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp index f6b4d88311..ca8dba4b88 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp @@ -188,7 +188,7 @@ static void variantSetValue(T d) QVariant v; QBENCHMARK { for(int i = 0; i < ITERATION_COUNT; ++i) { - qVariantSetValue(v, d); + v.setValue(d); } } } diff --git a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp index e93a1013e7..fe9e37c5d5 100644 --- a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp +++ b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp @@ -168,13 +168,13 @@ void tst_QDBusPerformance::oneWay_data() QByteArray ba(256, 'a'); while (ba.size() < 8193) { - QTest::newRow(QString("%1-byteArray").arg(ba.size()).toAscii()) << qVariantFromValue(ba) << ba.size(); + QTest::newRow(QString("%1-byteArray").arg(ba.size()).toAscii()) << QVariant::fromValue(ba) << ba.size(); ba += ba; } QString s(256, QLatin1Char('a')); while (s.size() < 8193) { - QTest::newRow(QString("%1-string").arg(s.size()).toAscii()) << qVariantFromValue(s) << s.size(); + QTest::newRow(QString("%1-string").arg(s.size()).toAscii()) << QVariant::fromValue(s) << s.size(); s += s; } } @@ -197,7 +197,7 @@ void tst_QDBusPerformance::oneWayVariant() QFETCH(QVariant, data); QFETCH(int, size); - QVERIFY(executeTest("size", size, qVariantFromValue(QDBusVariant(data)))); + QVERIFY(executeTest("size", size, QVariant::fromValue(QDBusVariant(data)))); } void tst_QDBusPerformance::roundTrip_data() @@ -223,7 +223,7 @@ void tst_QDBusPerformance::roundTripVariant() QFETCH(QVariant, data); QFETCH(int, size); - QVERIFY(executeTest("echo", size, qVariantFromValue(QDBusVariant(data)))); + QVERIFY(executeTest("echo", size, QVariant::fromValue(QDBusVariant(data)))); } QTEST_MAIN(tst_QDBusPerformance) -- cgit v1.2.3