diff options
Diffstat (limited to 'tests/benchmarks/dbus/qdbusperformance')
3 files changed, 9 insertions, 9 deletions
diff --git a/tests/benchmarks/dbus/qdbusperformance/server/server.cpp b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp index 765852cfca..556de71568 100644 --- a/tests/benchmarks/dbus/qdbusperformance/server/server.cpp +++ b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp @@ -43,7 +43,7 @@ #include "../serverobject.h" -static const char serviceName[] = "com.trolltech.autotests.performance"; +static const char serviceName[] = "org.qtproject.autotests.performance"; static const char objectPath[] = "/"; int main(int argc, char *argv[]) diff --git a/tests/benchmarks/dbus/qdbusperformance/serverobject.h b/tests/benchmarks/dbus/qdbusperformance/serverobject.h index bc173aa762..857f31fec8 100644 --- a/tests/benchmarks/dbus/qdbusperformance/serverobject.h +++ b/tests/benchmarks/dbus/qdbusperformance/serverobject.h @@ -49,7 +49,7 @@ class ServerObject: public QObject { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "com.trolltech.autotests.Performance") + Q_CLASSINFO("D-Bus Interface", "org.qtproject.autotests.Performance") public: ServerObject(const QString &objectPath, QDBusConnection conn, QObject *parent = 0) : QObject(parent) 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) |