From 1b9878fdd38cf79f18cd6050962bea00cee196a1 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 26 Apr 2015 19:26:16 +0200 Subject: [PATCH] refs #395, some functions renamed in network provider/context Goal: consistent function names in own and remote aircraft provider --- src/blackcore/airspace_monitor.cpp | 4 ++-- src/blackcore/airspace_monitor.h | 4 ++-- src/blackcore/context_network.h | 2 +- src/blackcore/context_network_empty.h | 4 ++-- src/blackcore/context_network_impl.cpp | 8 ++++---- src/blackcore/context_network_impl.h | 4 ++-- src/blackcore/context_network_proxy.cpp | 4 ++-- src/blackcore/context_network_proxy.h | 4 ++-- src/blackcore/context_ownaircraft_proxy.cpp | 12 ++++++------ src/blackcore/simulator.cpp | 2 +- src/blackgui/components/mappingcomponent.cpp | 4 ++-- src/blackgui/components/textmessagecomponent.cpp | 2 +- src/blackmisc/simulation/remoteaircraftprovider.cpp | 4 ++-- .../simulation/remoteaircraftproviderdummy.cpp | 2 +- .../simulation/remoteaircraftproviderdummy.h | 4 ++-- src/plugins/simulator/fsx/simulator_fsx.cpp | 2 +- src/plugins/simulator/xplane/simulator_xplane.cpp | 2 +- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/blackcore/airspace_monitor.cpp b/src/blackcore/airspace_monitor.cpp index 262fcebab..5f116c2ac 100644 --- a/src/blackcore/airspace_monitor.cpp +++ b/src/blackcore/airspace_monitor.cpp @@ -69,7 +69,7 @@ namespace BlackCore return m_aircraftInRange; } - CSimulatedAircraft CAirspaceMonitor::getAircraftForCallsign(const CCallsign &callsign) const + CSimulatedAircraft CAirspaceMonitor::getAircraftInRangeForCallsign(const CCallsign &callsign) const { QReadLocker l(&m_lockAircraft); return m_aircraftInRange.findFirstByCallsign(callsign); @@ -979,7 +979,7 @@ namespace BlackCore { Q_ASSERT(BlackCore::isCurrentThreadCreatingThread(this)); - CSimulatedAircraft simAircraft(getAircraftForCallsign(callsign)); + CSimulatedAircraft simAircraft(getAircraftInRangeForCallsign(callsign)); // If we are not yet synchronized, we throw away any incremental packet if (!simAircraft.hasValidCallsign()) { return; } diff --git a/src/blackcore/airspace_monitor.h b/src/blackcore/airspace_monitor.h index ac60b2c5d..e899960f2 100644 --- a/src/blackcore/airspace_monitor.h +++ b/src/blackcore/airspace_monitor.h @@ -48,9 +48,9 @@ namespace BlackCore //! \ingroup remoteaircraftprovider virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override; - //! \copydoc IRemoteAircraftProvider::getAircraftForCallsign + //! \copydoc IRemoteAircraftProvider::getAircraftInRangeForCallsign //! \ingroup remoteaircraftprovider - virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; + virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; //! \copydoc IRemoteAircraftProvider::getAircraftInRangeCount //! \ingroup remoteaircraftprovider diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index 043c17a33..cb0ccb135 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -152,7 +152,7 @@ namespace BlackCore virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const = 0; //! Aircraft for given callsign - virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const = 0; + virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const = 0; //! Aircraft count virtual int getAircraftInRangeCount() const = 0; diff --git a/src/blackcore/context_network_empty.h b/src/blackcore/context_network_empty.h index 6d3b62c96..c9dd98a6f 100644 --- a/src/blackcore/context_network_empty.h +++ b/src/blackcore/context_network_empty.h @@ -58,8 +58,8 @@ namespace BlackCore return BlackMisc::Simulation::CSimulatedAircraftList(); } - //! \copydoc IContextNetwork::getAircraftForCallsign - virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override + //! \copydoc IContextNetwork::getAircraftInRangeForCallsign + virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override { Q_UNUSED(callsign); logEmptyContextWarning(Q_FUNC_INFO); diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/context_network_impl.cpp index f6d8a1e94..7b227be15 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/context_network_impl.cpp @@ -480,7 +480,7 @@ namespace BlackCore return this->m_airspace->getAircraftInRangeCount(); } - CSimulatedAircraft CContextNetwork::getAircraftForCallsign(const CCallsign &callsign) const + CSimulatedAircraft CContextNetwork::getAircraftInRangeForCallsign(const CCallsign &callsign) const { if (this->isDebugEnabled()) { BlackMisc::CLogMessage(this, BlackMisc::CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; } return this->m_airspace->getAircraftInRange().findFirstByCallsign(callsign); @@ -524,7 +524,7 @@ namespace BlackCore bool c = this->m_airspace->updateAircraftEnabled(callsign, enabledForRedering, originator); if (c) { - CSimulatedAircraft aircraft(this->getAircraftForCallsign(callsign)); + CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign)); emit this->changedRemoteAircraftEnabled(aircraft, originator); } return c; @@ -536,7 +536,7 @@ namespace BlackCore bool c = this->m_airspace->updateAircraftModel(callsign, model, originator); if (c) { - CSimulatedAircraft aircraft(this->getAircraftForCallsign(callsign)); + CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign)); emit this->changedRemoteAircraftModel(aircraft, originator); } return c; @@ -548,7 +548,7 @@ namespace BlackCore bool c = this->m_airspace->updateFastPositionEnabled(callsign, enableFastPositonUpdates, originator); if (c) { - CSimulatedAircraft aircraft(this->getAircraftForCallsign(callsign)); + CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign)); CLogMessage(this).info("Callsign %1 sets fast positions ") << aircraft.getCallsign() << BlackMisc::boolToOnOff(aircraft.fastPositionUpdates()); emit this->changedFastPositionUpdates(aircraft, originator); } diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/context_network_impl.h index 1fdec2c32..2e0aa7893 100644 --- a/src/blackcore/context_network_impl.h +++ b/src/blackcore/context_network_impl.h @@ -117,9 +117,9 @@ namespace BlackCore //! \ingroup remoteaircraftprovider virtual int getAircraftInRangeCount() const override; - //! \copydoc IContextNetwork::getAircraftForCallsign + //! \copydoc IContextNetwork::getAircraftInRangeForCallsign //! \ingroup remoteaircraftprovider - virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; + virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; //! \copydoc IContextNetwork::getOnlineStationForCallsign virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; diff --git a/src/blackcore/context_network_proxy.cpp b/src/blackcore/context_network_proxy.cpp index fe4683cca..ade3513f8 100644 --- a/src/blackcore/context_network_proxy.cpp +++ b/src/blackcore/context_network_proxy.cpp @@ -118,9 +118,9 @@ namespace BlackCore return this->m_dBusInterface->callDBusRet(QLatin1Literal("getAircraftInRangeCount")); } - Simulation::CSimulatedAircraft CContextNetworkProxy::getAircraftForCallsign(const CCallsign &callsign) const + Simulation::CSimulatedAircraft CContextNetworkProxy::getAircraftInRangeForCallsign(const CCallsign &callsign) const { - return this->m_dBusInterface->callDBusRet(QLatin1Literal("getAircraftForCallsign"), callsign); + return this->m_dBusInterface->callDBusRet(QLatin1Literal("getAircraftInRangeForCallsign"), callsign); } CAtcStation CContextNetworkProxy::getOnlineStationForCallsign(const CCallsign &callsign) const diff --git a/src/blackcore/context_network_proxy.h b/src/blackcore/context_network_proxy.h index 382d2835e..9ffa39439 100644 --- a/src/blackcore/context_network_proxy.h +++ b/src/blackcore/context_network_proxy.h @@ -69,8 +69,8 @@ namespace BlackCore //! \copydoc IContextNetwork::getAircraftInRangeCount virtual int getAircraftInRangeCount() const override; - //! \copydoc IContextNetwork::getAircraftForCallsign - virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; + //! \copydoc IContextNetwork::getAircraftInRangeForCallsign + virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; //! \copydoc IContextNetwork::getOnlineStationForCallsign virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; diff --git a/src/blackcore/context_ownaircraft_proxy.cpp b/src/blackcore/context_ownaircraft_proxy.cpp index d683da7bb..bc7c6afab 100644 --- a/src/blackcore/context_ownaircraft_proxy.cpp +++ b/src/blackcore/context_ownaircraft_proxy.cpp @@ -40,11 +40,6 @@ namespace BlackCore return this->m_dBusInterface->callDBusRet(QLatin1Literal("getOwnAircraft")); } - bool CContextOwnAircraftProxy::updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) - { - return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateOwnPosition"), position, altitude); - } - bool CContextOwnAircraftProxy::updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateCockpit"), com1, com2, transponder, originator); @@ -57,7 +52,7 @@ namespace BlackCore bool CContextOwnAircraftProxy::updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) { - return this->m_dBusInterface->callDBusRet(QLatin1Literal("updatePilot"), pilot); + return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateOwnAircraftPilot"), pilot); } bool CContextOwnAircraftProxy::updateSelcal(const CSelcal &selcal, const QString &originator) @@ -65,6 +60,11 @@ namespace BlackCore return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateSelcal"), selcal, originator); } + bool CContextOwnAircraftProxy::updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) + { + return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateOwnPosition"), position, altitude); + } + bool CContextOwnAircraftProxy::updateOwnCallsign(const CCallsign &callsign) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("updateOwnCallsign"), callsign); diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index 1d10f560d..274e2ea51 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -107,7 +107,7 @@ namespace BlackCore void CSimulatorCommon::resetAircraftFromBacked(const CCallsign &callsign) { - CSimulatedAircraft aircraft(this->getAircraftForCallsign(callsign)); + CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign)); bool enabled = aircraft.isEnabled(); if (enabled) { diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp index 23fbfbbf5..dc0aa65cc 100644 --- a/src/blackgui/components/mappingcomponent.cpp +++ b/src/blackgui/components/mappingcomponent.cpp @@ -143,7 +143,7 @@ namespace BlackGui void CMappingComponent::ps_onChangedSimulatedAircraftInView(const BlackMisc::CVariant &object, const BlackMisc::CPropertyIndex &index) { const CSimulatedAircraft sa = object.to(); // changed in GUI - const CSimulatedAircraft saFromBackend = this->getIContextNetwork()->getAircraftForCallsign(sa.getCallsign()); + const CSimulatedAircraft saFromBackend = this->getIContextNetwork()->getAircraftInRangeForCallsign(sa.getCallsign()); if (!saFromBackend.hasValidCallsign()) { return; } // obviously deleted if (index.contains(CSimulatedAircraft::IndexEnabled)) { @@ -231,7 +231,7 @@ namespace BlackGui return; } - CSimulatedAircraft aircraftFromBackend = this->getIContextNetwork()->getAircraftForCallsign(callsign); + CSimulatedAircraft aircraftFromBackend = this->getIContextNetwork()->getAircraftInRangeForCallsign(callsign); bool enabled = this->ui->cb_AircraftEnabled->isChecked(); bool changed = false; if (aircraftFromBackend.getModelString() != modelString) diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index 04d25f1ad..11bbc29ff 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -458,7 +458,7 @@ namespace BlackGui QWidget *w = findTextMessageTabByCallsign(callsign, true); if (!w && getIContextNetwork()) { - CSimulatedAircraft aircraft(getIContextNetwork()->getAircraftForCallsign(callsign)); + CSimulatedAircraft aircraft(getIContextNetwork()->getAircraftInRangeForCallsign(callsign)); if (!aircraft.getCallsign().isEmpty()) { // we assume a private message diff --git a/src/blackmisc/simulation/remoteaircraftprovider.cpp b/src/blackmisc/simulation/remoteaircraftprovider.cpp index 375da3ae7..d226121b6 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.cpp +++ b/src/blackmisc/simulation/remoteaircraftprovider.cpp @@ -28,10 +28,10 @@ namespace BlackMisc return this->m_remoteAircraftProvider->getAircraftInRangeCount(); } - CSimulatedAircraft CRemoteAircraftAware::getAircraftForCallsign(const CCallsign &callsign) const + CSimulatedAircraft CRemoteAircraftAware::getAircraftInRangeForCallsign(const CCallsign &callsign) const { Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available"); - return this->m_remoteAircraftProvider->getAircraftForCallsign(callsign); + return this->m_remoteAircraftProvider->getAircraftInRangeForCallsign(callsign); } CAircraftSituationList CRemoteAircraftAware::remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp index 7a8d99acc..9cee5e872 100644 --- a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp +++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp @@ -29,7 +29,7 @@ namespace BlackMisc return m_aircraft.size(); } - CSimulatedAircraft CRemoteAircraftProviderDummy::getAircraftForCallsign(const CCallsign &callsign) const + CSimulatedAircraft CRemoteAircraftProviderDummy::getAircraftInRangeForCallsign(const CCallsign &callsign) const { return m_aircraft.findFirstByCallsign(callsign); } diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.h b/src/blackmisc/simulation/remoteaircraftproviderdummy.h index 57bc0dd92..3ff0d3679 100644 --- a/src/blackmisc/simulation/remoteaircraftproviderdummy.h +++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.h @@ -38,8 +38,8 @@ namespace BlackMisc //! IRemoteAircraftProvider::getAircraftInRangeCount virtual int getAircraftInRangeCount() const override; - //! IRemoteAircraftProvider::getAircraftForCallsign - virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; + //! IRemoteAircraftProvider::getAircraftInRangeForCallsign + virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; //! \copydoc IRemoteAircraftProvider::remoteAircraftParts virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const override; diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp index 261b6cdaf..cad81bf98 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.cpp +++ b/src/plugins/simulator/fsx/simulator_fsx.cpp @@ -165,7 +165,7 @@ namespace BlackSimPlugin CAircraftModel aircraftModel = modelMatching(newRemoteAircraftCopy); Q_ASSERT_X(newRemoteAircraft.getCallsign() == aircraftModel.getCallsign(), Q_FUNC_INFO, "mismatching callsigns"); this->updateAircraftModel(newRemoteAircraft.getCallsign(), aircraftModel, simulatorOriginator()); - CSimulatedAircraft aircraftAfterModelApplied(getAircraftForCallsign(newRemoteAircraft.getCallsign())); + CSimulatedAircraft aircraftAfterModelApplied(getAircraftInRangeForCallsign(newRemoteAircraft.getCallsign())); aircraftAfterModelApplied.setRendered(true); emit modelMatchingCompleted(aircraftAfterModelApplied); diff --git a/src/plugins/simulator/xplane/simulator_xplane.cpp b/src/plugins/simulator/xplane/simulator_xplane.cpp index 257ea0188..8b22ae83a 100644 --- a/src/plugins/simulator/xplane/simulator_xplane.cpp +++ b/src/plugins/simulator/xplane/simulator_xplane.cpp @@ -336,7 +336,7 @@ namespace BlackSimPlugin { //! \todo XP implement isRenderedAircraft correctly // work around, but not really telling me if callsign is really(!) visible in SIM - return getAircraftForCallsign(callsign).isRendered(); + return getAircraftInRangeForCallsign(callsign).isRendered(); } bool CSimulatorXPlane::updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const QString &originator)