1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix class and file names in the d-bus examples

Browse Source 
some omissions from the com.trolltech => org.example replacement.

Change-Id: I078c272fc3729fc7b9e9cd3e6ede7c21f0386b62
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen 2012-08-02 20:49:12 +02:00 committed by Qt by Nokia
parent 0ef4bf1c1e
commit 5bea177ab1
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/dbus/dbus-chat/chat.cpp
View File

@ -62,8 +62,8 @@ ChatMainWindow::ChatMainWindow()
new ChatAdaptor(this); new ChatAdaptor(this);
QDBusConnection::sessionBus().registerObject("/", this); QDBusConnection::sessionBus().registerObject("/", this);
com::trolltech::chat *iface; org::example::chat *iface;
iface = new com::trolltech::chat(QString(), QString(), QDBusConnection::sessionBus(), this); iface = new org::example::chat(QString(), QString(), QDBusConnection::sessionBus(), this);
//connect(iface, SIGNAL(message(QString,QString)), this, SLOT(messageSlot(QString,QString))); //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))); 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))); connect(iface, SIGNAL(action(QString,QString)), this, SLOT(actionSlot(QString,QString)));

6
examples/dbus/dbus-chat/chat_interface.cpp
View File

@ -50,15 +50,15 @@
#include "chat_interface.h" #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) : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
{ {
} }
ComTrolltechChatInterface::~ComTrolltechChatInterface() OrgExampleChatInterface::~OrgExampleChatInterface()
{ {
} }

12
examples/dbus/dbus-chat/chat_interface.h
View File

@ -62,7 +62,7 @@
/* /*
* Proxy class for interface org.example.chat * Proxy class for interface org.example.chat
*/ */
class ComTrolltechChatInterface: public QDBusAbstractInterface class OrgExampleChatInterface: public QDBusAbstractInterface
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -70,9 +70,9 @@ public:
{ return "org.example.chat"; } { return "org.example.chat"; }
public: 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 public Q_SLOTS: // METHODS
Q_SIGNALS: // SIGNALS Q_SIGNALS: // SIGNALS
@ -80,9 +80,9 @@ Q_SIGNALS: // SIGNALS
void message(const QString &nickname, const QString &text); void message(const QString &nickname, const QString &text);
}; };
namespace com { namespace org {
namespace trolltech { namespace example {
typedef ::ComTrolltechChatInterface chat; typedef ::OrgExampleChatInterface chat;
} }
} }
#endif #endif

0
examples/dbus/dbus-chat/com.trolltech.chat.xml → examples/dbus/dbus-chat/org.example.chat.xml
View File

6
examples/dbus/remotecontrolledcar/controller/car_interface.cpp
View File

@ -50,15 +50,15 @@
#include "car_interface.h" #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) : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
{ {
} }
ComTrolltechExamplesCarInterfaceInterface::~ComTrolltechExamplesCarInterfaceInterface() OrgExampleExamplesCarInterfaceInterface::~OrgExampleExamplesCarInterfaceInterface()
{ {
} }

12
examples/dbus/remotecontrolledcar/controller/car_interface.h
View File

@ -62,7 +62,7 @@
/* /*
* Proxy class for interface org.example.Examples.CarInterface * Proxy class for interface org.example.Examples.CarInterface
*/ */
class ComTrolltechExamplesCarInterfaceInterface: public QDBusAbstractInterface class OrgExampleExamplesCarInterfaceInterface: public QDBusAbstractInterface
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -70,9 +70,9 @@ public:
{ return "org.example.Examples.CarInterface"; } { return "org.example.Examples.CarInterface"; }
public: 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 public Q_SLOTS: // METHODS
inline QDBusPendingReply<> accelerate() inline QDBusPendingReply<> accelerate()
@ -103,10 +103,10 @@ Q_SIGNALS: // SIGNALS
void crashed(); void crashed();
}; };
namespace com { namespace org {
namespace trolltech { namespace example {
namespace Examples { namespace Examples {
typedef ::ComTrolltechExamplesCarInterfaceInterface CarInterface; typedef ::OrgExampleExamplesCarInterfaceInterface CarInterface;
} }
} }
} }

2
examples/dbus/remotecontrolledcar/controller/controller.cpp
View File

@ -47,7 +47,7 @@ Controller::Controller(QWidget *parent)
: QWidget(parent) : QWidget(parent)
{ {
ui.setupUi(this); 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); QDBusConnection::sessionBus(), this);
startTimer(1000); startTimer(1000);
} }

2
examples/dbus/remotecontrolledcar/controller/controller.h
View File

@ -62,7 +62,7 @@ private slots:
private: private:
Ui::Controller ui; Ui::Controller ui;
com::trolltech::Examples::CarInterface *car; org::example::Examples::CarInterface *car;
}; };
#endif #endif