From c715e93c5817faaa96fae67c6f00da4bdff1d943 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 30 Jan 2016 02:30:19 +0100 Subject: [PATCH] refs #577 improved airline filter (wildcard) --- src/blackgui/filters/airlineicaofilterbar.cpp | 4 ++-- src/blackgui/models/airlineicaofilter.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/blackgui/filters/airlineicaofilterbar.cpp b/src/blackgui/filters/airlineicaofilterbar.cpp index 4ae5887fc..d37975d3b 100644 --- a/src/blackgui/filters/airlineicaofilterbar.cpp +++ b/src/blackgui/filters/airlineicaofilterbar.cpp @@ -43,8 +43,8 @@ namespace BlackGui { return std::unique_ptr( new CAirlineIcaoFilter( - this->ui->le_Designator->text(), - this->ui->le_Name->text(), + this->ui->le_Designator->text().trimmed(), + this->ui->le_Name->text().trimmed(), this->ui->country_Selector->isSet() ? this->ui->country_Selector->getCountry().getIsoCode() : "", this->ui->cb_RealAirline->isChecked(), this->ui->cb_VirtualAirline->isChecked() diff --git a/src/blackgui/models/airlineicaofilter.cpp b/src/blackgui/models/airlineicaofilter.cpp index 02db1fad4..0c79945f2 100644 --- a/src/blackgui/models/airlineicaofilter.cpp +++ b/src/blackgui/models/airlineicaofilter.cpp @@ -31,8 +31,7 @@ namespace BlackGui { if (!m_vDesignator.isEmpty()) { - if (!icao.matchesVDesignator(m_vDesignator)) { continue; } - end = true; // there should me only one designator + if (!this->stringMatchesFilterExpression(icao.getVDesignator(), m_vDesignator)) { continue; } } if (!this->m_name.isEmpty())