summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp')
-rw-r--r--tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
index bd7f09d660..fe9e37c5d5 100644
--- a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
+++ b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
@@ -44,7 +44,7 @@
#include "./serverobject.h"
-static const char serviceName[] = "com.trolltech.autotests.performance";
+static const char serviceName[] = "org.qtproject.autotests.performance";
static const int runTime = 500;
class tst_QDBusPerformance: public QObject
@@ -98,11 +98,11 @@ void tst_QDBusPerformance::initTestCase()
QTestEventLoop::instance().enterLoop(5);
QVERIFY(con.interface()->isServiceRegistered(serviceName));
- remote = new QDBusInterface(serviceName, "/", "com.trolltech.autotests.Performance", con, this);
+ remote = new QDBusInterface(serviceName, "/", "org.qtproject.autotests.Performance", con, this);
QVERIFY(remote->isValid());
new ServerObject("/", con, this);
- local = new QDBusInterface(con.baseService(), "/", "com.trolltech.autotests.Performance", con, this);
+ local = new QDBusInterface(con.baseService(), "/", "org.qtproject.autotests.Performance", con, this);
QVERIFY(local->isValid());
}
@@ -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)