From 5bea177ab11f057849d2b072c4ed088ef4e052f0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 2 Aug 2012 20:49:12 +0200 Subject: fix class and file names in the d-bus examples some omissions from the com.trolltech => org.example replacement. Change-Id: I078c272fc3729fc7b9e9cd3e6ede7c21f0386b62 Reviewed-by: Thiago Macieira --- examples/dbus/dbus-chat/chat.cpp | 4 ++-- examples/dbus/dbus-chat/chat_interface.cpp | 6 +++--- examples/dbus/dbus-chat/chat_interface.h | 12 ++++++------ examples/dbus/dbus-chat/com.trolltech.chat.xml | 15 --------------- examples/dbus/dbus-chat/org.example.chat.xml | 15 +++++++++++++++ .../dbus/remotecontrolledcar/controller/car_interface.cpp | 6 +++--- .../dbus/remotecontrolledcar/controller/car_interface.h | 12 ++++++------ .../dbus/remotecontrolledcar/controller/controller.cpp | 2 +- examples/dbus/remotecontrolledcar/controller/controller.h | 2 +- 9 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 examples/dbus/dbus-chat/com.trolltech.chat.xml create mode 100644 examples/dbus/dbus-chat/org.example.chat.xml (limited to 'examples/dbus') diff --git a/examples/dbus/dbus-chat/chat.cpp b/examples/dbus/dbus-chat/chat.cpp index beeccb0622..3c3c0f921c 100644 --- a/examples/dbus/dbus-chat/chat.cpp +++ b/examples/dbus/dbus-chat/chat.cpp @@ -62,8 +62,8 @@ ChatMainWindow::ChatMainWindow() new ChatAdaptor(this); QDBusConnection::sessionBus().registerObject("/", this); - com::trolltech::chat *iface; - iface = new com::trolltech::chat(QString(), QString(), QDBusConnection::sessionBus(), this); + org::example::chat *iface; + iface = new org::example::chat(QString(), QString(), QDBusConnection::sessionBus(), this); //connect(iface, SIGNAL(message(QString,QString)), 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))); diff --git a/examples/dbus/dbus-chat/chat_interface.cpp b/examples/dbus/dbus-chat/chat_interface.cpp index eb2258d5d4..01dc595ed2 100644 --- a/examples/dbus/dbus-chat/chat_interface.cpp +++ b/examples/dbus/dbus-chat/chat_interface.cpp @@ -50,15 +50,15 @@ #include "chat_interface.h" /* - * Implementation of interface class ComTrolltechChatInterface + * Implementation of interface class OrgExampleChatInterface */ -ComTrolltechChatInterface::ComTrolltechChatInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) +OrgExampleChatInterface::OrgExampleChatInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent) { } -ComTrolltechChatInterface::~ComTrolltechChatInterface() +OrgExampleChatInterface::~OrgExampleChatInterface() { } diff --git a/examples/dbus/dbus-chat/chat_interface.h b/examples/dbus/dbus-chat/chat_interface.h index ee01a79e4c..f4d524efc9 100644 --- a/examples/dbus/dbus-chat/chat_interface.h +++ b/examples/dbus/dbus-chat/chat_interface.h @@ -62,7 +62,7 @@ /* * Proxy class for interface org.example.chat */ -class ComTrolltechChatInterface: public QDBusAbstractInterface +class OrgExampleChatInterface: public QDBusAbstractInterface { Q_OBJECT public: @@ -70,9 +70,9 @@ public: { return "org.example.chat"; } public: - ComTrolltechChatInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); + OrgExampleChatInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); - ~ComTrolltechChatInterface(); + ~OrgExampleChatInterface(); public Q_SLOTS: // METHODS Q_SIGNALS: // SIGNALS @@ -80,9 +80,9 @@ Q_SIGNALS: // SIGNALS void message(const QString &nickname, const QString &text); }; -namespace com { - namespace trolltech { - typedef ::ComTrolltechChatInterface chat; +namespace org { + namespace example { + typedef ::OrgExampleChatInterface chat; } } #endif diff --git a/examples/dbus/dbus-chat/com.trolltech.chat.xml b/examples/dbus/dbus-chat/com.trolltech.chat.xml deleted file mode 100644 index acb6dc1d57..0000000000 --- a/examples/dbus/dbus-chat/com.trolltech.chat.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - diff --git a/examples/dbus/dbus-chat/org.example.chat.xml b/examples/dbus/dbus-chat/org.example.chat.xml new file mode 100644 index 0000000000..acb6dc1d57 --- /dev/null +++ b/examples/dbus/dbus-chat/org.example.chat.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/examples/dbus/remotecontrolledcar/controller/car_interface.cpp b/examples/dbus/remotecontrolledcar/controller/car_interface.cpp index 8f495ea62c..3a7020eac7 100644 --- a/examples/dbus/remotecontrolledcar/controller/car_interface.cpp +++ b/examples/dbus/remotecontrolledcar/controller/car_interface.cpp @@ -50,15 +50,15 @@ #include "car_interface.h" /* - * Implementation of interface class ComTrolltechExamplesCarInterfaceInterface + * Implementation of interface class OrgExampleExamplesCarInterfaceInterface */ -ComTrolltechExamplesCarInterfaceInterface::ComTrolltechExamplesCarInterfaceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) +OrgExampleExamplesCarInterfaceInterface::OrgExampleExamplesCarInterfaceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent) { } -ComTrolltechExamplesCarInterfaceInterface::~ComTrolltechExamplesCarInterfaceInterface() +OrgExampleExamplesCarInterfaceInterface::~OrgExampleExamplesCarInterfaceInterface() { } diff --git a/examples/dbus/remotecontrolledcar/controller/car_interface.h b/examples/dbus/remotecontrolledcar/controller/car_interface.h index 8d624b3746..1696b2fe83 100644 --- a/examples/dbus/remotecontrolledcar/controller/car_interface.h +++ b/examples/dbus/remotecontrolledcar/controller/car_interface.h @@ -62,7 +62,7 @@ /* * Proxy class for interface org.example.Examples.CarInterface */ -class ComTrolltechExamplesCarInterfaceInterface: public QDBusAbstractInterface +class OrgExampleExamplesCarInterfaceInterface: public QDBusAbstractInterface { Q_OBJECT public: @@ -70,9 +70,9 @@ public: { return "org.example.Examples.CarInterface"; } public: - ComTrolltechExamplesCarInterfaceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); + OrgExampleExamplesCarInterfaceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); - ~ComTrolltechExamplesCarInterfaceInterface(); + ~OrgExampleExamplesCarInterfaceInterface(); public Q_SLOTS: // METHODS inline QDBusPendingReply<> accelerate() @@ -103,10 +103,10 @@ Q_SIGNALS: // SIGNALS void crashed(); }; -namespace com { - namespace trolltech { +namespace org { + namespace example { namespace Examples { - typedef ::ComTrolltechExamplesCarInterfaceInterface CarInterface; + typedef ::OrgExampleExamplesCarInterfaceInterface CarInterface; } } } diff --git a/examples/dbus/remotecontrolledcar/controller/controller.cpp b/examples/dbus/remotecontrolledcar/controller/controller.cpp index fb829da17c..9c4950acdc 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("org.example.CarExample", "/Car", + car = new org::example::Examples::CarInterface("org.example.CarExample", "/Car", QDBusConnection::sessionBus(), this); startTimer(1000); } diff --git a/examples/dbus/remotecontrolledcar/controller/controller.h b/examples/dbus/remotecontrolledcar/controller/controller.h index 2d8c9031ad..0ce8a8ead3 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.h +++ b/examples/dbus/remotecontrolledcar/controller/controller.h @@ -62,7 +62,7 @@ private slots: private: Ui::Controller ui; - com::trolltech::Examples::CarInterface *car; + org::example::Examples::CarInterface *car; }; #endif -- cgit v1.2.3