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>
This commit is contained in:
parent
0ef4bf1c1e
commit
5bea177ab1
@ -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)));
|
||||
|
@ -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()
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
@ -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()
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -62,7 +62,7 @@ private slots:
|
||||
|
||||
private:
|
||||
Ui::Controller ui;
|
||||
com::trolltech::Examples::CarInterface *car;
|
||||
org::example::Examples::CarInterface *car;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user