From 08d7cddfe5d3b547cb05be44d44ab6afde5d23d7 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 21 Jul 2019 03:56:31 +0200 Subject: [PATCH] Style --- src/blackcore/simulator.cpp | 8 ++++++-- src/plugins/simulator/xplane/simulatorxplane.cpp | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index e3a1afc5d..bc2501aa8 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -77,7 +77,7 @@ namespace BlackCore return true; } - // will be added with next snapshot onRecalculatedRenderedAircraft + // will be removed with next snapshot onRecalculatedRenderedAircraft return false; } @@ -98,7 +98,11 @@ namespace BlackCore if (!remoteAircraft.isEnabled()) { return false; } // if not restriced, directly change - if (!renderingRestricted) { this->callPhysicallyAddRemoteAircraft(remoteAircraft); return true; } + if (!renderingRestricted) + { + this->callPhysicallyAddRemoteAircraft(remoteAircraft); + return true; + } // restricted -> will be added with next snapshot onRecalculatedRenderedAircraft return false; diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index e7aa34905..1cfd21c1b 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -369,14 +369,14 @@ namespace BlackSimPlugin } emitOwnAircraftModelChanged(m_serviceProxy->getAircraftModelPath(), m_serviceProxy->getAircraftModelFilename(), m_serviceProxy->getAircraftLivery(), - m_serviceProxy->getAircraftIcaoCode(), m_serviceProxy->getAircraftModelString(), m_serviceProxy->getAircraftName(), m_serviceProxy->getAircraftDescription()); + m_serviceProxy->getAircraftIcaoCode(), m_serviceProxy->getAircraftModelString(), m_serviceProxy->getAircraftName(), m_serviceProxy->getAircraftDescription()); QString xplaneVersion = QStringLiteral("%1.%2").arg(m_serviceProxy->getXPlaneVersionMajor()).arg(m_serviceProxy->getXPlaneVersionMinor()); setSimulatorDetails("X-Plane", {}, xplaneVersion); - connect(m_serviceProxy, &CXSwiftBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitOwnAircraftModelChanged); + connect(m_serviceProxy, &CXSwiftBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitOwnAircraftModelChanged); connect(m_serviceProxy, &CXSwiftBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::setAirportsInRange); m_serviceProxy->updateAirportsInRange(); - connect(m_trafficProxy, &CXSwiftBusTrafficProxy::simFrame, this, &CSimulatorXPlane::updateRemoteAircraft); - connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftAdded, this, &CSimulatorXPlane::onRemoteAircraftAdded); + connect(m_trafficProxy, &CXSwiftBusTrafficProxy::simFrame, this, &CSimulatorXPlane::updateRemoteAircraft); + connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftAdded, this, &CSimulatorXPlane::onRemoteAircraftAdded); connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftAddingFailed, this, &CSimulatorXPlane::onRemoteAircraftAddingFailed); if (m_watcher) { m_watcher->setConnection(m_dBusConnection); } m_trafficProxy->removeAllPlanes();