flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-08-07 01:55:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

A couple of xbus cleanups

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/simulator/xplane/simulator_xplane.cpp
View File

@@ -24,14 +24,16 @@ using namespace BlackMisc::Simulation;
using namespace BlackMisc::Geo;
using namespace BlackSim;
namespace {
inline QString xbusServiceName() {
return QStringLiteral("org.swift.xbus");
}
}
namespace BlackSimPlugin
{
namespace XPlane
{
static inline QString xbusServiceName() {
return QStringLiteral("org.swift.xbus");
}
CSimulatorXPlane::CSimulatorXPlane(IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, QObject *parent) :
CSimulatorCommon(CSimulatorInfo::XP(), ownAircraftProvider, remoteAircraftProvider, parent)
@@ -232,7 +234,10 @@ namespace BlackSimPlugin
void CSimulatorXPlane::displayStatusMessage(const BlackMisc::CStatusMessage &message) const
{
Q_ASSERT(isConnected());
/* We do not assert here as status message may come because of network problems */
if (!isConnected())
return;
// TODO XPLMSpeakString()?
// http://www.xsquawkbox.net/xpsdk/mediawiki/XPLMSpeakString
Q_UNUSED(message);
@@ -240,7 +245,9 @@ namespace BlackSimPlugin
void CSimulatorXPlane::displayTextMessage(const BlackMisc::Network::CTextMessage &message) const
{
Q_ASSERT(isConnected());
if (!isConnected())
return;
// TODO XPLMSpeakString()?
// http://www.xsquawkbox.net/xpsdk/mediawiki/XPLMSpeakString
Q_UNUSED(message);

8
src/xbus/plugin.cpp
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);