flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 02:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes #269 added parameter to CDBusServer constructor to choose a different service name,

Browse Source 
allows two servers running on the same bus, needed when running xbus and sample_blackcore
This commit is contained in:
Mathew Sutcliffe
2014-06-17 21:20:15 +01:00
parent c4a0207e4f
commit 072667b3b4
6 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackcore/dbus_server.h
View File

@@ -14,7 +14,7 @@
#include <QStringList>
#include <QMap>
#define BLACKCORE_DBUSERVER_SERVICENAME "org.vatsim.pilotClient"
#define BLACKCORE_RUNTIME_SERVICENAME "net.vatsim.pilotClient"
namespace BlackCore
@@ -27,7 +27,7 @@ namespace BlackCore
class CDBusServer : public QObject
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", BLACKCORE_DBUSERVER_SERVICENAME)
Q_CLASSINFO("D-Bus Interface", BLACKCORE_RUNTIME_SERVICENAME)
public:
//! \brief Service name of DBus serve
@@ -61,10 +61,13 @@ namespace BlackCore
}
public:
//! Constructor
//! Construct a server for the BlackCore runtime
//! \remarks We are using address and not ServerMode, as on some systems we need to pass in some specific configuration string
//! \sa QDBusServer
CDBusServer(const QString &address, QObject *parent = nullptr);
CDBusServer(const QString &address, QObject *parent = nullptr) : CDBusServer(CDBusServer::ServiceName, address, parent) {}
//! Construct a server for some arbitrary service
CDBusServer(const QString &service, const QString &address, QObject *parent = nullptr);
//!! Adds a QObject to be exposed to DBus
void addObject(const QString &name, QObject *object);