diff options
Diffstat (limited to 'examples/dbus/dbus-chat')
-rw-r--r-- | examples/dbus/dbus-chat/chat.cpp | 4 | ||||
-rw-r--r-- | examples/dbus/dbus-chat/chat_adaptor.cpp | 2 | ||||
-rw-r--r-- | examples/dbus/dbus-chat/chat_adaptor.h | 8 | ||||
-rw-r--r-- | examples/dbus/dbus-chat/chat_interface.cpp | 2 | ||||
-rw-r--r-- | examples/dbus/dbus-chat/chat_interface.h | 6 | ||||
-rw-r--r-- | examples/dbus/dbus-chat/com.trolltech.chat.xml | 2 | ||||
-rw-r--r-- | examples/dbus/dbus-chat/dbus-chat.pro | 4 |
7 files changed, 14 insertions, 14 deletions
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", "" -" <interface name=\"com.trolltech.chat\">\n" +" <interface name=\"org.example.chat\">\n" " <signal name=\"message\">\n" " <arg direction=\"out\" type=\"s\" name=\"nickname\"/>\n" " <arg direction=\"out\" type=\"s\" name=\"text\"/>\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 <QtDBus/QtDBus> /* - * 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 @@ <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> <node> - <interface name="com.trolltech.chat"> + <interface name="org.example.chat"> <signal name="message"> <arg name="nickname" type="s" direction="out"/> <arg name="text" type="s" direction="out"/> 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 |