summaryrefslogtreecommitdiffstats
path: root/examples/dbus/dbus-chat
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-08-02 20:49:12 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-07 18:55:43 +0200
commit5bea177ab11f057849d2b072c4ed088ef4e052f0 (patch)
treed6f7a0e5809033d59e9437cf336004b7de50727e /examples/dbus/dbus-chat
parent0ef4bf1c1e77d4b11f5f17babdd0065723901a7d (diff)
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 <thiago.macieira@intel.com>
Diffstat (limited to 'examples/dbus/dbus-chat')
-rw-r--r--examples/dbus/dbus-chat/chat.cpp4
-rw-r--r--examples/dbus/dbus-chat/chat_interface.cpp6
-rw-r--r--examples/dbus/dbus-chat/chat_interface.h12
-rw-r--r--examples/dbus/dbus-chat/org.example.chat.xml (renamed from examples/dbus/dbus-chat/com.trolltech.chat.xml)0
4 files changed, 11 insertions, 11 deletions
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/org.example.chat.xml
index acb6dc1d57..acb6dc1d57 100644
--- a/examples/dbus/dbus-chat/com.trolltech.chat.xml
+++ b/examples/dbus/dbus-chat/org.example.chat.xml