diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-04-20 14:31:12 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-22 21:32:33 +0200 |
| commit | 5f22899a17389e28930917336512dd531cc9b4f9 (patch) | |
| tree | cf9e138f9edbad3bfb8501a4647a04b65f59d6b2 /examples/dbus/remotecontrolledcar/controller | |
| parent | c4a457f8e48cbd6202da7c567988975b568615c0 (diff) | |
Use org.example instead of com.trolltech for the D-Bus examples
We could use org.qtproject, but since this is an example anyway, and
since example.org and example.com are reserved to IANA by RFC 2606
anyway, let's use that.
Task-number: QTBUG-23274
Change-Id: Icdb1ac0390f88b72fa21b02ab362f1a98f26266c
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
Diffstat (limited to 'examples/dbus/remotecontrolledcar/controller')
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/dbus/remotecontrolledcar/controller/car.xml b/examples/dbus/remotecontrolledcar/controller/car.xml index 641c6982d4..6d8c9d19f2 100644 --- a/examples/dbus/remotecontrolledcar/controller/car.xml +++ b/examples/dbus/remotecontrolledcar/controller/car.xml @@ -1,7 +1,7 @@ <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> <node name="/com/trollech/examples/car"> - <interface name="com.trolltech.Examples.CarInterface"> + <interface name="org.example.Examples.CarInterface"> <method name="accelerate"/> <method name="decelerate"/> <method name="turnLeft"/> diff --git a/examples/dbus/remotecontrolledcar/controller/car_interface.h b/examples/dbus/remotecontrolledcar/controller/car_interface.h index fadd127460..8d624b3746 100644 --- a/examples/dbus/remotecontrolledcar/controller/car_interface.h +++ b/examples/dbus/remotecontrolledcar/controller/car_interface.h @@ -60,14 +60,14 @@ #include <QtDBus/QtDBus> /* - * Proxy class for interface com.trolltech.Examples.CarInterface + * Proxy class for interface org.example.Examples.CarInterface */ class ComTrolltechExamplesCarInterfaceInterface: public QDBusAbstractInterface { Q_OBJECT public: static inline const char *staticInterfaceName() - { return "com.trolltech.Examples.CarInterface"; } + { return "org.example.Examples.CarInterface"; } public: ComTrolltechExamplesCarInterfaceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); diff --git a/examples/dbus/remotecontrolledcar/controller/controller.cpp b/examples/dbus/remotecontrolledcar/controller/controller.cpp index 77a6883b11..fb829da17c 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.cpp +++ b/examples/dbus/remotecontrolledcar/controller/controller.cpp @@ -47,7 +47,7 @@ Controller::Controller(QWidget *parent) : QWidget(parent) { ui.setupUi(this); - car = new com::trolltech::Examples::CarInterface("com.trolltech.CarExample", "/Car", + car = new com::trolltech::Examples::CarInterface("org.example.CarExample", "/Car", QDBusConnection::sessionBus(), this); startTimer(1000); } |