Ref T524, filter by combined type/manufacturer

This commit is contained in:
Klaus Basan
2019-01-27 17:18:09 +01:00
committed by Mat Sutcliffe
parent df19d74b39
commit 509a60d06f
4 changed files with 35 additions and 3 deletions

View File

@@ -371,7 +371,7 @@ namespace BlackMisc
const bool wildcard = cc.contains('*');
if (!wildcard) { return false; }
const QChar at = cc.at(0);
const QChar c = cc.at(1);
const QChar c = cc.at(1);
const QChar et = cc.at(2);
if (at != '*')
{
@@ -387,6 +387,12 @@ namespace BlackMisc
return cet.length() == 1 && cet.at(0) == et;
}
bool CAircraftIcaoCode::matchesCombinedTypeAndManufacturer(const QString &combinedType, const QString &manufacturer) const
{
return this->matchesCombinedType(combinedType) &&
this->matchesManufacturer(manufacturer);
}
QString CAircraftIcaoCode::getDesignatorManufacturer() const
{
return (this->hasDesignator() ? this->getDesignator() : QStringLiteral("????")) %