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

Accept also numbers in airport ICAO codes

Browse Source
This commit is contained in:
Roland Winklmeier
2016-06-28 16:18:09 +02:00
parent 63c88c6919
commit 77b60cbb7a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackmisc/aviation/airporticaocode.cpp
View File

@@ -1,7 +1,7 @@
#include "blackmisc/aviation/airporticaocode.h" #include "blackmisc/aviation/airporticaocode.h"
#include "blackmisc/compare.h" #include "blackmisc/compare.h"
#include <QRegExp> #include <QRegularExpression>
#include <Qt> #include <Qt>
#include <QtGlobal> #include <QtGlobal>
@@ -31,8 +31,9 @@ namespace BlackMisc
{ {
QString code = icaoCode.trimmed().toUpper(); QString code = icaoCode.trimmed().toUpper();
if (code.length() != 4) return ""; if (code.length() != 4) return "";
QRegExp reg("[A-Z]{4}"); QRegularExpression reg("^[A-Z0-9]{4}$");
return (reg.exactMatch(code)) ? code : ""; auto match = reg.match(code);
return match.hasMatch() ? code : QString();
} }
bool CAirportIcaoCode::isValidIcaoDesignator(const QString &icaoCode) bool CAirportIcaoCode::isValidIcaoDesignator(const QString &icaoCode)