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

refs #199 , method to unregister DBus objects for a graceful shutdown of our DBusServer

Browse Source
This commit is contained in:
Klaus Basan
2014-04-08 14:39:03 +02:00
parent 62109ac7f3
commit e7c9d7d294
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/blackcore/dbus_server.cpp
View File

@@ -145,5 +145,33 @@ namespace BlackCore
return this->m_busServer.lastError();
}
/*
* Unregister all objects
*/
void CDBusServer::unregisterAllObjects()
{
if (this->m_objects.isEmpty()) return;
foreach(QString path, this->m_objects.keys())
{
switch (this->m_serverMode)
{
case CDBusServer::SERVERMODE_SESSIONBUS:
QDBusConnection::sessionBus().unregisterObject(path);
break;
case CDBusServer::SERVERMODE_SYSTEMBUS:
QDBusConnection::systemBus().unregisterObject(path);
break;
case CDBusServer::SERVERMODE_P2P:
{
foreach(QDBusConnection con, this->m_DBusConnections)
{
con.unregisterObject(path);
}
break;
}
}
} // all paths
}
} // namespace BlackCore

13
src/blackcore/dbus_server.h
View File

@@ -80,9 +80,14 @@ namespace BlackCore
//! \brief Connection by name
const QDBusConnection getDbusConnection(const QString &connectionName) const
/*!
* \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());
}
@@ -93,7 +98,9 @@ namespace BlackCore
return this->m_DBusConnections.values();
}
//! \brief Default connection
//! Unregister all objects
void unregisterAllObjects();
//! Default connection
static const QDBusConnection &defaultConnection()
{