diff options
Diffstat (limited to 'tests/auto/dbus/qdbusinterface')
| -rw-r--r-- | tests/auto/dbus/qdbusinterface/myobject.h | 14 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp | 16 |
3 files changed, 18 insertions, 18 deletions
diff --git a/tests/auto/dbus/qdbusinterface/myobject.h b/tests/auto/dbus/qdbusinterface/myobject.h index 94e7b3d4c5..12c8da6ef6 100644 --- a/tests/auto/dbus/qdbusinterface/myobject.h +++ b/tests/auto/dbus/qdbusinterface/myobject.h @@ -50,12 +50,12 @@ Q_DECLARE_METATYPE(QVariantList) class MyObject: public QObject { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "com.trolltech.QtDBus.MyObject") + Q_CLASSINFO("D-Bus Interface", "org.qtproject.QtDBus.MyObject") Q_CLASSINFO("D-Bus Introspection", "" -" <interface name=\"com.trolltech.QtDBus.MyObject\" >\n" +" <interface name=\"org.qtproject.QtDBus.MyObject\" >\n" " <property access=\"readwrite\" type=\"i\" name=\"prop1\" />\n" " <property name=\"complexProp\" type=\"ai\" access=\"readwrite\">\n" -" <annotation name=\"com.trolltech.QtDBus.QtTypeName\" value=\"QList<int>\"/>\n" +" <annotation name=\"org.qtproject.QtDBus.QtTypeName\" value=\"QList<int>\"/>\n" " </property>\n" " <signal name=\"somethingHappened\" >\n" " <arg direction=\"out\" type=\"s\" />\n" @@ -83,14 +83,14 @@ class MyObject: public QObject " <method name=\"ping\" >\n" " <arg direction=\"in\" type=\"ai\" name=\"ping\" />\n" " <arg direction=\"out\" type=\"ai\" name=\"ping\" />\n" -" <annotation name=\"com.trolltech.QtDBus.QtTypeName.In0\" value=\"QList<int>\"/>\n" -" <annotation name=\"com.trolltech.QtDBus.QtTypeName.Out0\" value=\"QList<int>\"/>\n" +" <annotation name=\"org.qtproject.QtDBus.QtTypeName.In0\" value=\"QList<int>\"/>\n" +" <annotation name=\"org.qtproject.QtDBus.QtTypeName.Out0\" value=\"QList<int>\"/>\n" " </method>\n" " <method name=\"ping_invokable\" >\n" " <arg direction=\"in\" type=\"ai\" name=\"ping_invokable\" />\n" " <arg direction=\"out\" type=\"ai\" name=\"ping_invokable\" />\n" -" <annotation name=\"com.trolltech.QtDBus.QtTypeName.In0\" value=\"QList<int>\"/>\n" -" <annotation name=\"com.trolltech.QtDBus.QtTypeName.Out0\" value=\"QList<int>\"/>\n" +" <annotation name=\"org.qtproject.QtDBus.QtTypeName.In0\" value=\"QList<int>\"/>\n" +" <annotation name=\"org.qtproject.QtDBus.QtTypeName.Out0\" value=\"QList<int>\"/>\n" " </method>\n" " </interface>\n" "") diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp index 1815a6ef79..cb3cd1b27e 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp +++ b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp @@ -43,8 +43,8 @@ #include "../myobject.h" -static const char serviceName[] = "com.trolltech.autotests.qmyserver"; -static const char objectPath[] = "/com/trolltech/qmyserver"; +static const char serviceName[] = "org.qtproject.autotests.qmyserver"; +static const char objectPath[] = "/org/qtproject/qmyserver"; //static const char *interfaceName = serviceName; int MyObject::callCount = 0; @@ -53,7 +53,7 @@ QVariantList MyObject::callArgs; class MyServer : public QDBusServer { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "com.trolltech.autotests.qmyserver") + Q_CLASSINFO("D-Bus Interface", "org.qtproject.autotests.qmyserver") public: MyServer(QString addr = "unix:tmpdir=/tmp", QObject* parent = 0) diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp index c866c9d155..af2355aa5d 100644 --- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp +++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp @@ -50,11 +50,11 @@ #include "../qdbusmarshall/common.h" #include "myobject.h" -#define TEST_INTERFACE_NAME "com.trolltech.QtDBus.MyObject" +#define TEST_INTERFACE_NAME "org.qtproject.QtDBus.MyObject" #define TEST_SIGNAL_NAME "somethingHappened" -static const char serviceName[] = "com.trolltech.autotests.qmyserver"; -static const char objectPath[] = "/com/trolltech/qmyserver"; +static const char serviceName[] = "org.qtproject.autotests.qmyserver"; +static const char objectPath[] = "/org/qtproject/qmyserver"; static const char *interfaceName = serviceName; int MyObject::callCount = 0; @@ -63,9 +63,9 @@ QVariantList MyObject::callArgs; class MyObjectUnknownType: public QObject { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "com.trolltech.QtDBus.MyObject") + Q_CLASSINFO("D-Bus Interface", "org.qtproject.QtDBus.MyObject") Q_CLASSINFO("D-Bus Introspection", "" -" <interface name=\"com.trolltech.QtDBus.MyObjectUnknownTypes\" >\n" +" <interface name=\"org.qtproject.QtDBus.MyObjectUnknownTypes\" >\n" " <property access=\"readwrite\" type=\"~\" name=\"prop1\" />\n" " <signal name=\"somethingHappened\" >\n" " <arg direction=\"out\" type=\"~\" />\n" @@ -381,7 +381,7 @@ void tst_QDBusInterface::introspectUnknownTypes() MyObjectUnknownType obj; con.registerObject("/unknownTypes", &obj, QDBusConnection::ExportAllContents); QDBusInterface iface(QDBusConnection::sessionBus().baseService(), QLatin1String("/unknownTypes"), - "com.trolltech.QtDBus.MyObjectUnknownTypes"); + "org.qtproject.QtDBus.MyObjectUnknownTypes"); const QMetaObject *mo = iface.metaObject(); QVERIFY(mo->indexOfMethod("regularMethod()") != -1); // this is the control @@ -414,7 +414,7 @@ public: if (path == "/some/path/superNode") return "zitroneneis"; if (path == "/some/path/superNode/foo") - return " <interface name=\"com.trolltech.QtDBus.VirtualObject\">\n" + return " <interface name=\"org.qtproject.QtDBus.VirtualObject\">\n" " <method name=\"klingeling\" />\n" " </interface>\n" ; return QString(); @@ -460,7 +460,7 @@ void tst_QDBusInterface::introspectVirtualObject() QDBusMessage message2 = QDBusMessage::createMethodCall(con.baseService(), path + "/foo", "org.freedesktop.DBus.Introspectable", "Introspect"); QDBusMessage reply2 = con.call(message2, QDBus::Block, 5000); QVERIFY(reply2.arguments().at(0).toString().contains( - QRegExp("<node>.*<interface name=\"com.trolltech.QtDBus.VirtualObject\">" + QRegExp("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">" ".*<method name=\"klingeling\" />\n" ".*</interface>.*<interface name=") )); } |