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:
Michał Garapich
2015-03-11 20:45:01 +01:00
committed by Roland Winklmeier
parent ad8f84e344
commit b3b3f65ee3
2 changed files with 19 additions and 8 deletions

View File

@@ -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);