flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-06 01:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T704, moved "ifPossibleReduceNameTelephonyCountry" into airline code list, unified functions

Browse Source
This commit is contained in:
Klaus Basan
2019-07-16 01:04:11 +02:00
committed by Mat Sutcliffe
parent 1b4aa1162a
commit 9b5ffdf924
6 changed files with 117 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/blackmisc/aviation/airlineicaocode.cpp
View File

@@ -115,20 +115,20 @@ namespace BlackMisc
bool CAirlineIcaoCode::matchesDesignator(const QString &designator) const
{
if (designator.isEmpty()) { return false; }
return designator.trimmed().toUpper() == m_designator;
if (designator.isEmpty() || m_designator.isEmpty()) { return false; }
return caseInsensitiveStringCompare(m_designator, designator.trimmed());
}
bool CAirlineIcaoCode::matchesVDesignator(const QString &designator) const
{
if (designator.isEmpty()) { return false; }
return designator.trimmed().toUpper() == this->getVDesignator();
if (designator.isEmpty() || m_designator.isEmpty()) { return false; }
return caseInsensitiveStringCompare(this->getVDesignator(), designator.trimmed());
}
bool CAirlineIcaoCode::matchesIataCode(const QString &iata) const
{
if (iata.isEmpty()) { return false; }
return iata.trimmed().toUpper() == m_iataCode;
if (iata.isEmpty() || m_iataCode.isEmpty()) { return false; }
return caseInsensitiveStringCompare(m_iataCode, iata.trimmed());
}
bool CAirlineIcaoCode::matchesDesignatorOrIataCode(const QString &candidate) const
@@ -143,6 +143,12 @@ namespace BlackMisc
return this->matchesVDesignator(candidate) || this->matchesIataCode(candidate);
}
bool CAirlineIcaoCode::matchesTelephonyDesignator(const QString &candidate) const
{
if (candidate.isEmpty() || m_telephonyDesignator.isEmpty()) { return false; }
return caseInsensitiveStringCompare(m_telephonyDesignator, candidate.trimmed());
}
bool CAirlineIcaoCode::matchesNamesOrTelephonyDesignator(const QString &candidate) const
{
const QString cand(candidate.toUpper().trimmed());