flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-13 15:45:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #205, changes to CDBusServer

Browse Source 
* renamed newConnection -> registerObjectsWithConnection(const
* helper methods for address strings: isQtDBusAddress, p2pAddress, ...
* removed getDBusConnection(s) methods, no-where used
* Fixed constructor to use address strings correctly
This commit is contained in:
Klaus Basan
2014-04-12 02:50:19 +02:00
parent e70894dd59
commit fd57c16331
2 changed files with 121 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/blackcore/dbus_server.h
View File

@@ -62,6 +62,8 @@ namespace BlackCore
public:
//! Constructor
//! \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);
//!! Adds a QObject to be exposed to DBus
@@ -76,28 +78,6 @@ namespace BlackCore
//! address
QString address() const { return this->m_busServer.address(); }
//!
/*!
* \brief Connection by name
* \param connectionName empty string makes sense with session / system DBus, otherwise provide name for P2P
* \return
*/
const QDBusConnection getDBusConnection(const QString &connectionName = "")
{
if (connectionName.isEmpty()) return this->m_DBusConnections.first();
return this->m_DBusConnections.value(connectionName, CDBusServer::defaultConnection());
}
//! Get DBus connections
const QList<QDBusConnection> getDBusConnections() const
{
// http://stackoverflow.com/questions/1124340/any-ideas-why-qhash-and-qmap-return-const-t-instead-of-const-t
return this->m_DBusConnections.values();
}
//! Unregister all objects
void unregisterAllObjects();
@@ -122,10 +102,23 @@ namespace BlackCore
return system;
}
//! Denotes a P2P DBus server, e.g. "tcp:host=192.168.3.3,port=45000"
//! \remarks it is valid to pass only one string as host:port
static QString p2pAddress(const QString &host = "127.0.0.1", const QString &port = "");
//! Turn something like 127.0.0.1:45000 into "tcp:host=127.0.0.1,port=45000"
static QString fixAddressToDBusAddress(const QString &address);
//! address to DBus server mode
static ServerMode addressToDBusMode(const QString &address);
//! Qt DBus address, e.g. "unix:tmpdir=/tmp", "tcp:host=127.0.0.1,port=45000"
static bool isQtDBusAddress(const QString &address);
private slots:
//! \brief Called when a new DBus client has connected
bool newConnection(const QDBusConnection &connection);
//! \brief Called when a new DBus client has connected in P2P mode
bool registerObjectsWithConnection(const QDBusConnection &connection);
};
}