mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-23 15:25:35 +08:00
A couple of xbus cleanups
* Use function for xbus service name as it is in X-Plane plugin * Remove unsafe asserts
This commit is contained in:
committed by
Roland Winklmeier
parent
ad8f84e344
commit
b3b3f65ee3
@@ -7,7 +7,11 @@
|
||||
#include "service.h"
|
||||
#include "traffic.h"
|
||||
|
||||
#define XBUS_SERVICE_SERVICENAME "org.swift.xbus"
|
||||
namespace {
|
||||
inline QString xbusServiceName() {
|
||||
return QStringLiteral("org.swift.xbus");
|
||||
}
|
||||
}
|
||||
|
||||
namespace XBus
|
||||
{
|
||||
@@ -25,7 +29,7 @@ namespace XBus
|
||||
Q_ASSERT(! m_server);
|
||||
for (auto &item : m_startServerMenuItems) { item.setEnabled(false); }
|
||||
|
||||
m_server = new BlackCore::CDBusServer(XBUS_SERVICE_SERVICENAME, address, this);
|
||||
m_server = new BlackCore::CDBusServer(xbusServiceName(), address, this);
|
||||
m_service = new CService(this);
|
||||
m_traffic = new CTraffic(this);
|
||||
m_server->addObject(CService::ObjectPath(), m_service);
|
||||
|
||||
Reference in New Issue
Block a user