From 5f22899a17389e28930917336512dd531cc9b4f9 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 20 Apr 2012 14:31:12 +0200 Subject: 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 --- examples/dbus/complexpingpong/complexping.cpp | 2 +- examples/dbus/complexpingpong/complexpong.h | 2 +- examples/dbus/complexpingpong/ping-common.h | 2 +- examples/dbus/dbus-chat/chat.cpp | 4 ++-- examples/dbus/dbus-chat/chat_adaptor.cpp | 2 +- examples/dbus/dbus-chat/chat_adaptor.h | 8 ++++---- examples/dbus/dbus-chat/chat_interface.cpp | 2 +- examples/dbus/dbus-chat/chat_interface.h | 6 +++--- examples/dbus/dbus-chat/com.trolltech.chat.xml | 2 +- examples/dbus/dbus-chat/dbus-chat.pro | 4 ++-- examples/dbus/pingpong/ping-common.h | 2 +- examples/dbus/remotecontrolledcar/car/car.xml | 2 +- examples/dbus/remotecontrolledcar/car/car_adaptor.cpp | 8 ++++---- examples/dbus/remotecontrolledcar/car/car_adaptor.h | 6 +++--- examples/dbus/remotecontrolledcar/car/main.cpp | 2 +- examples/dbus/remotecontrolledcar/controller/car.xml | 2 +- examples/dbus/remotecontrolledcar/controller/car_interface.h | 4 ++-- examples/dbus/remotecontrolledcar/controller/controller.cpp | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) (limited to 'examples') diff --git a/examples/dbus/complexpingpong/complexping.cpp b/examples/dbus/complexpingpong/complexping.cpp index aa39290f8b..97bc5e6103 100644 --- a/examples/dbus/complexpingpong/complexping.cpp +++ b/examples/dbus/complexpingpong/complexping.cpp @@ -60,7 +60,7 @@ void Ping::start(const QString &name, const QString &oldValue, const QString &ne qstdin.open(stdin, QIODevice::ReadOnly); // find our remote - iface = new QDBusInterface(SERVICE_NAME, "/", "com.trolltech.QtDBus.ComplexPong.Pong", + iface = new QDBusInterface(SERVICE_NAME, "/", "org.example.QtDBus.ComplexPong.Pong", QDBusConnection::sessionBus(), this); if (!iface->isValid()) { fprintf(stderr, "%s\n", diff --git a/examples/dbus/complexpingpong/complexpong.h b/examples/dbus/complexpingpong/complexpong.h index e458f9e37f..94a3083bd8 100644 --- a/examples/dbus/complexpingpong/complexpong.h +++ b/examples/dbus/complexpingpong/complexpong.h @@ -48,7 +48,7 @@ class Pong: public QDBusAbstractAdaptor { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "com.trolltech.QtDBus.ComplexPong.Pong") + Q_CLASSINFO("D-Bus Interface", "org.example.QtDBus.ComplexPong.Pong") Q_PROPERTY(QString value READ value WRITE setValue) public: QString m_value; diff --git a/examples/dbus/complexpingpong/ping-common.h b/examples/dbus/complexpingpong/ping-common.h index 987c8b6d96..0cde67302f 100644 --- a/examples/dbus/complexpingpong/ping-common.h +++ b/examples/dbus/complexpingpong/ping-common.h @@ -38,4 +38,4 @@ ** ****************************************************************************/ -#define SERVICE_NAME "com.trolltech.QtDBus.PingExample" +#define SERVICE_NAME "org.example.QtDBus.PingExample" diff --git a/examples/dbus/dbus-chat/chat.cpp b/examples/dbus/dbus-chat/chat.cpp index f5d834fea4..beeccb0622 100644 --- a/examples/dbus/dbus-chat/chat.cpp +++ b/examples/dbus/dbus-chat/chat.cpp @@ -65,7 +65,7 @@ ChatMainWindow::ChatMainWindow() com::trolltech::chat *iface; iface = new com::trolltech::chat(QString(), QString(), QDBusConnection::sessionBus(), this); //connect(iface, SIGNAL(message(QString,QString)), this, SLOT(messageSlot(QString,QString))); - QDBusConnection::sessionBus().connect(QString(), QString(), "com.trolltech.chat", "message", this, SLOT(messageSlot(QString,QString))); + QDBusConnection::sessionBus().connect(QString(), QString(), "org.example.chat", "message", this, SLOT(messageSlot(QString,QString))); connect(iface, SIGNAL(action(QString,QString)), this, SLOT(actionSlot(QString,QString))); NicknameDialog dialog; @@ -115,7 +115,7 @@ void ChatMainWindow::textChangedSlot(const QString &newText) void ChatMainWindow::sendClickedSlot() { //emit message(m_nickname, messageLineEdit->text()); - QDBusMessage msg = QDBusMessage::createSignal("/", "com.trolltech.chat", "message"); + QDBusMessage msg = QDBusMessage::createSignal("/", "org.example.chat", "message"); msg << m_nickname << messageLineEdit->text(); QDBusConnection::sessionBus().send(msg); messageLineEdit->setText(QString()); diff --git a/examples/dbus/dbus-chat/chat_adaptor.cpp b/examples/dbus/dbus-chat/chat_adaptor.cpp index e088dffaa4..c3a5600390 100644 --- a/examples/dbus/dbus-chat/chat_adaptor.cpp +++ b/examples/dbus/dbus-chat/chat_adaptor.cpp @@ -38,7 +38,7 @@ ** ** ** This file was generated by qdbusxml2cpp version 0.7 -** Command line was: qdbusxml2cpp -i chat_adaptor.h -a :chat_adaptor.cpp com.trolltech.chat.xml +** Command line was: qdbusxml2cpp -i chat_adaptor.h -a :chat_adaptor.cpp org.example.chat.xml ** ** qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** diff --git a/examples/dbus/dbus-chat/chat_adaptor.h b/examples/dbus/dbus-chat/chat_adaptor.h index e682665cce..2cb576724e 100644 --- a/examples/dbus/dbus-chat/chat_adaptor.h +++ b/examples/dbus/dbus-chat/chat_adaptor.h @@ -38,7 +38,7 @@ ** ** ** This file was generated by qdbusxml2cpp version 0.7 -** Command line was: qdbusxml2cpp -a chat_adaptor.h: com.trolltech.chat.xml +** Command line was: qdbusxml2cpp -a chat_adaptor.h: org.example.chat.xml ** ** qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** @@ -64,14 +64,14 @@ class QVariant; QT_END_NAMESPACE /* - * Adaptor class for interface com.trolltech.chat + * Adaptor class for interface org.example.chat */ class ChatAdaptor: public QDBusAbstractAdaptor { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "com.trolltech.chat") + Q_CLASSINFO("D-Bus Interface", "org.example.chat") Q_CLASSINFO("D-Bus Introspection", "" -" \n" +" \n" " \n" " \n" " \n" diff --git a/examples/dbus/dbus-chat/chat_interface.cpp b/examples/dbus/dbus-chat/chat_interface.cpp index 8c35e537ed..eb2258d5d4 100644 --- a/examples/dbus/dbus-chat/chat_interface.cpp +++ b/examples/dbus/dbus-chat/chat_interface.cpp @@ -38,7 +38,7 @@ ** ** ** This file was generated by qdbusxml2cpp version 0.7 -** Command line was: qdbusxml2cpp -i chat_interface.h -p :chat_interface.cpp com.trolltech.chat.xml +** Command line was: qdbusxml2cpp -i chat_interface.h -p :chat_interface.cpp org.example.chat.xml ** ** qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** diff --git a/examples/dbus/dbus-chat/chat_interface.h b/examples/dbus/dbus-chat/chat_interface.h index 3ef00df2d4..ee01a79e4c 100644 --- a/examples/dbus/dbus-chat/chat_interface.h +++ b/examples/dbus/dbus-chat/chat_interface.h @@ -38,7 +38,7 @@ ** ** ** This file was generated by qdbusxml2cpp version 0.7 -** Command line was: qdbusxml2cpp -p chat_interface.h: com.trolltech.chat.xml +** Command line was: qdbusxml2cpp -p chat_interface.h: org.example.chat.xml ** ** qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** @@ -60,14 +60,14 @@ #include /* - * Proxy class for interface com.trolltech.chat + * Proxy class for interface org.example.chat */ class ComTrolltechChatInterface: public QDBusAbstractInterface { Q_OBJECT public: static inline const char *staticInterfaceName() - { return "com.trolltech.chat"; } + { return "org.example.chat"; } public: ComTrolltechChatInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); diff --git a/examples/dbus/dbus-chat/com.trolltech.chat.xml b/examples/dbus/dbus-chat/com.trolltech.chat.xml index 618c8c4dcc..acb6dc1d57 100644 --- a/examples/dbus/dbus-chat/com.trolltech.chat.xml +++ b/examples/dbus/dbus-chat/com.trolltech.chat.xml @@ -1,7 +1,7 @@ - + diff --git a/examples/dbus/dbus-chat/dbus-chat.pro b/examples/dbus/dbus-chat/dbus-chat.pro index 29b1f56826..2dc17fe667 100644 --- a/examples/dbus/dbus-chat/dbus-chat.pro +++ b/examples/dbus/dbus-chat/dbus-chat.pro @@ -5,8 +5,8 @@ HEADERS += chat.h chat_adaptor.h chat_interface.h SOURCES += chat.cpp chat_adaptor.cpp chat_interface.cpp FORMS += chatmainwindow.ui chatsetnickname.ui -#DBUS_ADAPTORS += com.trolltech.chat.xml -#DBUS_INTERFACES += com.trolltech.chat.xml +#DBUS_ADAPTORS += org.example.chat.xml +#DBUS_INTERFACES += org.example.chat.xml # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/chat diff --git a/examples/dbus/pingpong/ping-common.h b/examples/dbus/pingpong/ping-common.h index 987c8b6d96..0cde67302f 100644 --- a/examples/dbus/pingpong/ping-common.h +++ b/examples/dbus/pingpong/ping-common.h @@ -38,4 +38,4 @@ ** ****************************************************************************/ -#define SERVICE_NAME "com.trolltech.QtDBus.PingExample" +#define SERVICE_NAME "org.example.QtDBus.PingExample" 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 @@ - + 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", "" -" \n" +" \n" " \n" " \n" " \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(); } 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 @@ - + 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 /* - * 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); } -- cgit v1.2.3