diff --git a/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp b/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp index 36993dfc7..cc31ff76d 100644 --- a/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp +++ b/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp @@ -24,7 +24,19 @@ namespace BlackSimPlugin CXSwiftBusServiceProxy::CXSwiftBusServiceProxy(QDBusConnection &connection, QObject *parent, bool dummy) : QObject(parent) { m_dbusInterface = new BlackMisc::CGenericDBusInterface(XSWIFTBUS_SERVICE_SERVICENAME, ObjectPath(), InterfaceName(), connection, this); - if (!dummy) { m_dbusInterface->relayParentSignals(); } + if (!dummy) + { + bool s; + s = connection.connect(QString(), "/xswiftbus/service", "org.swift_project.xswiftbus.service", + "aircraftModelChanged", this, + SIGNAL(aircraftModelChanged(QString, QString, QString, QString, QString, QString, QString))); + Q_ASSERT(s); + + s = connection.connect(QString(), "/xswiftbus/service", "org.swift_project.xswiftbus.service", + "airportsInRangeUpdated", this, + SIGNAL(airportsInRangeUpdated(QStringList, QStringList, QList, QList, QList))); + Q_ASSERT(s); + } } void CXSwiftBusServiceProxy::getOwnAircraftSituationData(XPlaneData *o_xplaneData) diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp index c1ba36846..6142bbc45 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp @@ -24,7 +24,21 @@ namespace BlackSimPlugin CXSwiftBusTrafficProxy::CXSwiftBusTrafficProxy(QDBusConnection &connection, QObject *parent, bool dummy) : QObject(parent) { m_dbusInterface = new BlackMisc::CGenericDBusInterface(XSWIFTBUS_SERVICENAME, ObjectPath(), InterfaceName(), connection, this); - if (!dummy) { m_dbusInterface->relayParentSignals(); } + if (!dummy) + { + bool s; + s = connection.connect(QString(), "/xswiftbus/traffic", "org.swift_project.xswiftbus.traffic", + "simFrame", this, SIGNAL(simFrame())); + Q_ASSERT(s); + + s = connection.connect(QString(), "/xswiftbus/traffic", "org.swift_project.xswiftbus.traffic", + "remoteAircraftAdded", this, SIGNAL(remoteAircraftAdded(QString))); + Q_ASSERT(s); + + s = connection.connect(QString(), "/xswiftbus/traffic", "org.swift_project.xswiftbus.traffic", + "remoteAircraftAddingFailed", this, SIGNAL(remoteAircraftAddingFailed(QString))); + Q_ASSERT(s); + } } bool CXSwiftBusTrafficProxy::initialize()