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/car | |
| 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/car')
4 files changed, 9 insertions, 9 deletions
diff --git a/examples/dbus/remotecontrolledcar/car/car.xml b/examples/dbus/remotecontrolledcar/car/car.xml index 641c6982d4..6d8c9d19f2 100644 --- a/examples/dbus/remotecontrolledcar/car/car.xml +++ b/examples/dbus/remotecontrolledcar/car/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/car/car_adaptor.cpp b/examples/dbus/remotecontrolledcar/car/car_adaptor.cpp index c7e62829be..e70b5bc873 100644 --- a/examples/dbus/remotecontrolledcar/car/car_adaptor.cpp +++ b/examples/dbus/remotecontrolledcar/car/car_adaptor.cpp @@ -74,25 +74,25 @@ CarInterfaceAdaptor::~CarInterfaceAdaptor() void CarInterfaceAdaptor::accelerate() { - // handle method call com.trolltech.Examples.CarInterface.accelerate + // handle method call org.example.Examples.CarInterface.accelerate QMetaObject::invokeMethod(parent(), "accelerate"); } void CarInterfaceAdaptor::decelerate() { - // handle method call com.trolltech.Examples.CarInterface.decelerate + // handle method call org.example.Examples.CarInterface.decelerate QMetaObject::invokeMethod(parent(), "decelerate"); } void CarInterfaceAdaptor::turnLeft() { - // handle method call com.trolltech.Examples.CarInterface.turnLeft + // handle method call org.example.Examples.CarInterface.turnLeft QMetaObject::invokeMethod(parent(), "turnLeft"); } void CarInterfaceAdaptor::turnRight() { - // handle method call com.trolltech.Examples.CarInterface.turnRight + // handle method call org.example.Examples.CarInterface.turnRight QMetaObject::invokeMethod(parent(), "turnRight"); } diff --git a/examples/dbus/remotecontrolledcar/car/car_adaptor.h b/examples/dbus/remotecontrolledcar/car/car_adaptor.h index 3c2c1dd124..c7542ae811 100644 --- a/examples/dbus/remotecontrolledcar/car/car_adaptor.h +++ b/examples/dbus/remotecontrolledcar/car/car_adaptor.h @@ -64,14 +64,14 @@ class QVariant; QT_END_NAMESPACE /* - * Adaptor class for interface com.trolltech.Examples.CarInterface + * Adaptor class for interface org.example.Examples.CarInterface */ class CarInterfaceAdaptor: public QDBusAbstractAdaptor { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "com.trolltech.Examples.CarInterface") + Q_CLASSINFO("D-Bus Interface", "org.example.Examples.CarInterface") Q_CLASSINFO("D-Bus Introspection", "" -" <interface name=\"com.trolltech.Examples.CarInterface\">\n" +" <interface name=\"org.example.Examples.CarInterface\">\n" " <method name=\"accelerate\"/>\n" " <method name=\"decelerate\"/>\n" " <method name=\"turnLeft\"/>\n" diff --git a/examples/dbus/remotecontrolledcar/car/main.cpp b/examples/dbus/remotecontrolledcar/car/main.cpp index 99dccbae0c..7bb4aa1720 100644 --- a/examples/dbus/remotecontrolledcar/car/main.cpp +++ b/examples/dbus/remotecontrolledcar/car/main.cpp @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) new CarInterfaceAdaptor(car); QDBusConnection connection = QDBusConnection::sessionBus(); connection.registerObject("/Car", car); - connection.registerService("com.trolltech.CarExample"); + connection.registerService("org.example.CarExample"); return app.exec(); } |