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

refs #721 For performance, avoid regular expressions where a simple algorithm would suffice.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-08-11 17:07:05 +01:00
parent ffa24411d2
commit 15cf07c1c5
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,10 @@ namespace BlackMisc
if (candidate.isEmpty() || !this->hasName()) { return false; }
// try unaltered name first (should be faster)
if (this->getName().contains(candidate, Qt::CaseInsensitive)) { return true; }
return this->getSimplifiedName().contains(candidate, Qt::CaseInsensitive);
auto simplifiedName = makeRange(getName().begin(), getName().end()).findBy([](QChar c) { return c.isLetter(); });
auto it = std::search(simplifiedName.begin(), simplifiedName.end(), candidate.begin(), candidate.end(), [](QChar a, QChar b) { return a.toUpper() == b.toUpper(); });
return it != simplifiedName.end();
}
bool CAirlineIcaoCode::hasCompleteData() const
@@ -286,11 +289,9 @@ namespace BlackMisc
bool CAirlineIcaoCode::isValidAirlineDesignator(const QString &airline)
{
if (airline.length() < 2 || airline.length() > 5) return false;
static QThreadStorage<QRegularExpression> tsRegex;
if (! tsRegex.hasLocalData()) { tsRegex.setLocalData(QRegularExpression("^[A-Z0-9]+$")); }
const QRegularExpression &regexp = tsRegex.localData();
return (regexp.match(airline).hasMatch());
auto chars = makeRange(airline.begin(), airline.end());
if (chars.containsBy([](QChar c) { return !c.isUpper() && !c.isDigit(); })) { return false; }
return true;
}
QString CAirlineIcaoCode::normalizeDesignator(const QString candidate)