summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/dbus
diff options
context:
space:
mode:
authorDebao Zhang <dbzhang800@gmail.com>2012-04-29 00:11:28 -0700
committerQt by Nokia <qt-info@nokia.com>2012-05-02 08:30:59 +0200
commitade888860334d207f5f070b0bc9c4c98deaf3862 (patch)
tree133a3bde54e8ef5fa8857814a45cc5000ee5b287 /tests/benchmarks/dbus
parent6102ab8d646d76a68bb460885394501e90b4fd1f (diff)
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 <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/benchmarks/dbus')
-rw-r--r--tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp8
1 files changed, 4 insertions, 4 deletions
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)