diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-03-29 11:11:03 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-16 00:07:39 +0200 |
| commit | e02a144a3c8e7858d879ac2d0038bc7d00906ae6 (patch) | |
| tree | 3d44c764483a4035bb3310d4a1ba8153a4cdead1 /tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp | |
| parent | 65e75acd05b16fea11d85f3a6a330d50c8ce7c5d (diff) | |
Finish cleaning up com.trolltech -> org.qtproject in QtDBus
Lots of uses of the annotations and error names, plus a bunch of local
unit test names (including one file that had to be renamed).
The meta object generator is updated to support both the old and new
names. That means some references to com.trolltech *must* remain in the
source code.
Task-number: QTBUG-23274
Change-Id: Icc38ae040232f07c437e7546ee744a4703f41726
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
Diffstat (limited to 'tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp')
| -rw-r--r-- | tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp index 57d7f82c1f..8412fb85be 100644 --- a/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp +++ b/tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp @@ -49,8 +49,8 @@ #include <dbus/dbus.h> -static const char serviceName[] = "com.trolltech.autotests.qpong"; -static const char objectPath[] = "/com/trolltech/qpong"; +static const char serviceName[] = "org.qtproject.autotests.qpong"; +static const char objectPath[] = "/org/qtproject/qpong"; static const char *interfaceName = serviceName; class tst_QDBusMarshall: public QObject @@ -925,7 +925,7 @@ void tst_QDBusMarshall::sendCallErrors_data() // this error comes from the bus server QTest::newRow("empty-service") << "" << objectPath << interfaceName << "ping" << QVariantList() << "org.freedesktop.DBus.Error.UnknownMethod" - << "Method \"ping\" with signature \"\" on interface \"com.trolltech.autotests.qpong\" doesn't exist\n" << (const char*)0; + << "Method \"ping\" with signature \"\" on interface \"org.qtproject.autotests.qpong\" doesn't exist\n" << (const char*)0; QTest::newRow("invalid-service") << "this isn't valid" << objectPath << interfaceName << "ping" << QVariantList() << "org.qtproject.QtDBus.Error.InvalidService" |