From 8ba5463d1838b33200f913f66bdd11b3bc3cff26 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 28 Aug 2018 01:16:24 +0200 Subject: [PATCH] Ref T310, renamings --- src/blackcore/aircraftmatcher.cpp | 2 +- src/blackcore/modelsetbuilder.cpp | 2 +- src/blackgui/components/flightplancomponent.cpp | 2 +- src/blackgui/filters/aircrafticaofilterbar.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp index 400cf6935..9fd8bc021 100644 --- a/src/blackcore/aircraftmatcher.cpp +++ b/src/blackcore/aircraftmatcher.cpp @@ -554,7 +554,7 @@ namespace BlackCore return CAircraftIcaoCode(); } - const QSet allIcaos = aircraft.allIcaoCodes(); + const QSet allIcaos = aircraft.allDesignators(); const QString allIcaosStr = allIcaos.toList().join(", "); CMatchingUtils::addLogDetailsToList(log, callsign, QString("Aircraft '%1' known for airline '%2'").arg(allIcaosStr, airline.getDesignator())); diff --git a/src/blackcore/modelsetbuilder.cpp b/src/blackcore/modelsetbuilder.cpp index b086b345e..942b96a67 100644 --- a/src/blackcore/modelsetbuilder.cpp +++ b/src/blackcore/modelsetbuilder.cpp @@ -52,7 +52,7 @@ namespace BlackCore else if (options.testFlag(OnlyDbIcaoCodes)) { Q_ASSERT_X(sApp->hasWebDataServices(), Q_FUNC_INFO, "No web data services"); - const QSet designators(sApp->getWebDataServices()->getAircraftIcaoCodes().allIcaoCodes()); + const QSet designators(sApp->getWebDataServices()->getAircraftIcaoCodes().allDesignators()); modelSet = modelSet.findWithAircraftDesignator(designators); } else diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index 353327b99..1bbbcf062 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -818,7 +818,7 @@ namespace BlackGui void CFlightPlanComponent::initCompleters() { if (!sGui || !sGui->hasWebDataServices()) { return; } - const QStringList aircraft(sGui->getWebDataServices()->getAircraftIcaoCodes().allIcaoCodes().toList()); + const QStringList aircraft(sGui->getWebDataServices()->getAircraftIcaoCodes().allDesignators().toList()); ui->le_AircraftType->setCompleter(new QCompleter(aircraft, this)); const QStringList airports = sGui->getWebDataServices()->getAirports().allIcaoCodes(true); diff --git a/src/blackgui/filters/aircrafticaofilterbar.cpp b/src/blackgui/filters/aircrafticaofilterbar.cpp index 00badd445..14d7a7b57 100644 --- a/src/blackgui/filters/aircrafticaofilterbar.cpp +++ b/src/blackgui/filters/aircrafticaofilterbar.cpp @@ -129,7 +129,7 @@ namespace BlackGui if (sGui->getWebDataServices()->getAircraftIcaoCodesCount() < 1) { return; } m_hasCompleters = true; const CAircraftIcaoCodeList codes = sGui->getWebDataServices()->getAircraftIcaoCodes(); - const QStringList designators = codes.allIcaoCodes().toList(); + const QStringList designators = codes.allDesignators().toList(); ui->le_Designator->setCompleter(new QCompleter(designators, ui->le_Designator)); const QStringList families = codes.allFamilies().toList(); ui->le_Family->setCompleter(new QCompleter(families, ui->le_Family));