From a070e0e21521c49ddb010cfe409883dd0fddcc5b Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 3 Oct 2017 23:01:16 +0200 Subject: [PATCH] Ref T129, fixed typo --- src/blackcore/aircraftmatcher.cpp | 6 +++--- src/blackcore/aircraftmatcher.h | 4 ++-- src/blackcore/airspacemonitor.cpp | 5 ++--- src/blackgui/components/modelmatchercomponent.cpp | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp index d794d0bfd..d6da94cf0 100644 --- a/src/blackcore/aircraftmatcher.cpp +++ b/src/blackcore/aircraftmatcher.cpp @@ -135,17 +135,17 @@ namespace BlackCore return matchedModel; } - CAircraftModel CAircraftMatcher::reverselLookupModel(const CCallsign &callsign, const CAircraftIcaoCode &networkAircraftIcao, const CAirlineIcaoCode &networkAirlineIcao, const QString &networkLiveryInfo, const QString &networkModelString, CAircraftModel::ModelType type, CStatusMessageList *log) + CAircraftModel CAircraftMatcher::reverseLookupModel(const CCallsign &callsign, const CAircraftIcaoCode &networkAircraftIcao, const CAirlineIcaoCode &networkAirlineIcao, const QString &networkLiveryInfo, const QString &networkModelString, CAircraftModel::ModelType type, CStatusMessageList *log) { CLivery livery; livery.setAirlineIcaoCode(networkAirlineIcao); CAircraftModel model(networkModelString, type, "", networkAircraftIcao, livery); model.setCallsign(callsign); - model = CAircraftMatcher::reverselLookupModel(model, networkLiveryInfo, log); + model = CAircraftMatcher::reverseLookupModel(model, networkLiveryInfo, log); return model; } - CAircraftModel CAircraftMatcher::reverselLookupModel(const CAircraftModel &modelToLookup, const QString &networkLiveryInfo, CStatusMessageList *log) + CAircraftModel CAircraftMatcher::reverseLookupModel(const CAircraftModel &modelToLookup, const QString &networkLiveryInfo, CStatusMessageList *log) { Q_ASSERT_X(sApp, Q_FUNC_INFO, "Missing sApp"); Q_ASSERT_X(sApp->getWebDataServices(), Q_FUNC_INFO, "No web services"); diff --git a/src/blackcore/aircraftmatcher.h b/src/blackcore/aircraftmatcher.h index b30fb89dc..8e2076764 100644 --- a/src/blackcore/aircraftmatcher.h +++ b/src/blackcore/aircraftmatcher.h @@ -82,7 +82,7 @@ namespace BlackCore //! Try to find the corresponding data in DB and get best information for given data //! \threadsafe - static BlackMisc::Simulation::CAircraftModel reverselLookupModel( + static BlackMisc::Simulation::CAircraftModel reverseLookupModel( const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcaoCode &networkAircraftIcao, const BlackMisc::Aviation::CAirlineIcaoCode &networkAirlineIcao, const QString &networkLiveryInfo, const QString &networkModelString, @@ -91,7 +91,7 @@ namespace BlackCore //! Try to find the corresponding data in DB and get best information for following matching //! \threadsafe - static BlackMisc::Simulation::CAircraftModel reverselLookupModel( + static BlackMisc::Simulation::CAircraftModel reverseLookupModel( const BlackMisc::Simulation::CAircraftModel &modelToLookup, const QString &networkLiveryInfo, BlackMisc::CStatusMessageList *log = nullptr); diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index 11a05b059..fe35133a2 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -945,7 +945,7 @@ namespace BlackCore this->addReverseLookupMessage(callsign, QString("Setting telephoy designator '%1'").arg(telephony)); } } - return CAircraftMatcher::reverselLookupModel(callsign, aircraftIcao, airlineIcao, livery, modelString, type, log); + return CAircraftMatcher::reverseLookupModel(callsign, aircraftIcao, airlineIcao, livery, modelString, type, log); } bool CAirspaceMonitor::addNewAircraftInRange(const CSimulatedAircraft &aircraft) @@ -1069,9 +1069,8 @@ namespace BlackCore const CCallsign callsign(situation.getCallsign()); Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "Empty callsign"); - CAircraftSituation fullSituation(situation); - // store situation history + CAircraftSituation fullSituation(situation); this->storeAircraftSituation(fullSituation); { //! \fixme Workaround to consolidate time offset from storeAircraftSituation diff --git a/src/blackgui/components/modelmatchercomponent.cpp b/src/blackgui/components/modelmatchercomponent.cpp index 5b3bba77d..59fb3d622 100644 --- a/src/blackgui/components/modelmatchercomponent.cpp +++ b/src/blackgui/components/modelmatchercomponent.cpp @@ -114,7 +114,7 @@ namespace BlackGui if (ui->cb_withReverseLookup->isChecked()) { const QString liveryString(ui->comp_LiverySelector->getRawCombinedCode()); - const CAircraftModel reverseModel = CAircraftMatcher::reverselLookupModel(remoteAircraft.getModel(), liveryString, &msgs); + const CAircraftModel reverseModel = CAircraftMatcher::reverseLookupModel(remoteAircraft.getModel(), liveryString, &msgs); remoteAircraft.setModel(reverseModel); } @@ -131,7 +131,7 @@ namespace BlackGui this->m_matcher.setDefaultModel(CModelMatcherComponent::defaultModel()); const CSimulatedAircraft remoteAircraft(createAircraft()); const QString livery(ui->comp_LiverySelector->getRawCombinedCode()); - const CAircraftModel matched = CAircraftMatcher::reverselLookupModel(remoteAircraft.getModel(), livery, &msgs); + const CAircraftModel matched = CAircraftMatcher::reverseLookupModel(remoteAircraft.getModel(), livery, &msgs); ui->te_Results->setText(matched.toQString(true)); ui->tvp_ResultMessages->updateContainer(msgs); }