From 59eb0247a7a57e293026bdc961dd9cfb58d3240f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 26 Dec 2016 18:24:42 +0100 Subject: [PATCH] refs #506, applied recommended changes for 506 to other filters https://dev.vatsim-germany.org/issues/506#note-5 --- .../filters/aircrafticaofilterbar.cpp | 13 ++++---- .../filters/aircraftmodelfilterbar.cpp | 33 +++++++++---------- src/blackgui/filters/airlineicaofilterbar.cpp | 15 ++++----- src/blackgui/filters/countryfilterbar.cpp | 9 +++-- src/blackgui/filters/liveryfilterbar.cpp | 21 ++++++------ src/blackgui/models/airlineicaofilter.cpp | 2 -- src/blackgui/models/countryfilter.cpp | 2 +- 7 files changed, 44 insertions(+), 51 deletions(-) diff --git a/src/blackgui/filters/aircrafticaofilterbar.cpp b/src/blackgui/filters/aircrafticaofilterbar.cpp index 32ea856fe..149622988 100644 --- a/src/blackgui/filters/aircrafticaofilterbar.cpp +++ b/src/blackgui/filters/aircrafticaofilterbar.cpp @@ -50,13 +50,12 @@ namespace BlackGui std::unique_ptr > CAircraftIcaoFilterBar::createModelFilter() const { - return std::unique_ptr( - new CAircraftIcaoFilter( - ui->le_Designator->text(), - ui->le_Manufacturer->text(), - ui->le_Description->text(), - ui->combinedType_Selector->getCombinedType() - )); + return std::make_unique( + ui->le_Designator->text(), + ui->le_Manufacturer->text(), + ui->le_Description->text(), + ui->combinedType_Selector->getCombinedType() + ); } void CAircraftIcaoFilterBar::filter(const CAircraftIcaoCode &icao) diff --git a/src/blackgui/filters/aircraftmodelfilterbar.cpp b/src/blackgui/filters/aircraftmodelfilterbar.cpp index de057ce81..cd3553a6a 100644 --- a/src/blackgui/filters/aircraftmodelfilterbar.cpp +++ b/src/blackgui/filters/aircraftmodelfilterbar.cpp @@ -99,23 +99,22 @@ namespace BlackGui dbf = BlackMisc::Db::Invalid; } - return std::unique_ptr( - new CAircraftModelFilter( - ui->le_ModelString->text(), - ui->le_ModelDescription->text(), - mf, - dbf, - ui->cbt_Military->checkState(), - ui->cbt_ColorLiveries->checkState(), - ui->le_AircraftIcao->text(), - ui->le_AircraftManufacturer->text(), - ui->le_AirlineIcao->text(), - ui->le_AirlineName->text(), - ui->le_LiveryCode->text(), - ui->le_FileName->text(), - ui->frp_SimulatorSelector->getValue(), - ui->comp_DistributorSelector->getDistributor() - )); + return std::make_unique( + ui->le_ModelString->text(), + ui->le_ModelDescription->text(), + mf, + dbf, + ui->cbt_Military->checkState(), + ui->cbt_ColorLiveries->checkState(), + ui->le_AircraftIcao->text(), + ui->le_AircraftManufacturer->text(), + ui->le_AirlineIcao->text(), + ui->le_AirlineName->text(), + ui->le_LiveryCode->text(), + ui->le_FileName->text(), + ui->frp_SimulatorSelector->getValue(), + ui->comp_DistributorSelector->getDistributor() + ); } void CAircraftModelFilterBar::onRowCountChanged(int count, bool withFilter) diff --git a/src/blackgui/filters/airlineicaofilterbar.cpp b/src/blackgui/filters/airlineicaofilterbar.cpp index 01df03541..47c0f481b 100644 --- a/src/blackgui/filters/airlineicaofilterbar.cpp +++ b/src/blackgui/filters/airlineicaofilterbar.cpp @@ -50,14 +50,13 @@ namespace BlackGui std::unique_ptr > CAirlineIcaoFilterBar::createModelFilter() const { - return std::unique_ptr( - new CAirlineIcaoFilter( - ui->le_Designator->text().trimmed(), - ui->le_Name->text().trimmed(), - ui->country_Selector->isSet() ? ui->country_Selector->getCountry().getIsoCode() : "", - ui->cb_RealAirline->isChecked(), - ui->cb_VirtualAirline->isChecked() - )); + return std::make_unique( + ui->le_Designator->text().trimmed(), + ui->le_Name->text().trimmed(), + ui->country_Selector->isSet() ? ui->country_Selector->getCountry().getIsoCode() : "", + ui->cb_RealAirline->isChecked(), + ui->cb_VirtualAirline->isChecked() + ); } void CAirlineIcaoFilterBar::filter(const CAirlineIcaoCode &icao) diff --git a/src/blackgui/filters/countryfilterbar.cpp b/src/blackgui/filters/countryfilterbar.cpp index ad1d2254b..0fbc86674 100644 --- a/src/blackgui/filters/countryfilterbar.cpp +++ b/src/blackgui/filters/countryfilterbar.cpp @@ -46,11 +46,10 @@ namespace BlackGui std::unique_ptr > CCountryFilterBar::createModelFilter() const { - return std::unique_ptr( - new CCountryFilter( - ui->le_IsoCode->text(), - ui->le_Name->text() - )); + return std::make_unique( + ui->le_IsoCode->text(), + ui->le_Name->text() + ); } void CCountryFilterBar::onRowCountChanged(int count, bool withFilter) diff --git a/src/blackgui/filters/liveryfilterbar.cpp b/src/blackgui/filters/liveryfilterbar.cpp index 607476588..e2a7f9187 100644 --- a/src/blackgui/filters/liveryfilterbar.cpp +++ b/src/blackgui/filters/liveryfilterbar.cpp @@ -59,17 +59,16 @@ namespace BlackGui std::unique_ptr > CLiveryFilterBar::createModelFilter() const { double maxColorDistance = ui->hs_ColorDistance->value() / 100.0; - return std::unique_ptr( - new CLiveryFilter( - ui->le_LiveryCode->text(), - ui->le_Description->text(), - ui->le_AirlineIcaoCode->text(), - ui->color_Fuselage->getColor(), - ui->color_Tail->getColor(), - maxColorDistance, - ui->cb_Colors->isChecked(), - ui->cb_Airlines->isChecked() - )); + return std::make_unique( + ui->le_LiveryCode->text(), + ui->le_Description->text(), + ui->le_AirlineIcaoCode->text(), + ui->color_Fuselage->getColor(), + ui->color_Tail->getColor(), + maxColorDistance, + ui->cb_Colors->isChecked(), + ui->cb_Airlines->isChecked() + ); } void CLiveryFilterBar::filter(const CLivery &livery) diff --git a/src/blackgui/models/airlineicaofilter.cpp b/src/blackgui/models/airlineicaofilter.cpp index 1c3566947..fdb6f45b6 100644 --- a/src/blackgui/models/airlineicaofilter.cpp +++ b/src/blackgui/models/airlineicaofilter.cpp @@ -29,7 +29,6 @@ namespace BlackGui { if (!this->isValid()) { return inContainer; } CAirlineIcaoCodeList outContainer; - bool end = false; for (const CAirlineIcaoCode &icao : inContainer) { if (!m_vDesignator.isEmpty()) @@ -58,7 +57,6 @@ namespace BlackGui } outContainer.push_back(icao); - if (end) { break; } } return outContainer; } diff --git a/src/blackgui/models/countryfilter.cpp b/src/blackgui/models/countryfilter.cpp index b16e79bdb..d3c5a4af0 100644 --- a/src/blackgui/models/countryfilter.cpp +++ b/src/blackgui/models/countryfilter.cpp @@ -32,7 +32,7 @@ namespace BlackGui if (!m_isoCode.isEmpty()) { if (country.getIsoCode() != m_isoCode) { continue; } - end = true; // there should me only one designator + end = true; // there should be only one designator } if (!this->m_name.isEmpty())