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

Ref T226, country selector

Browse Source
This commit is contained in:
Klaus Basan
2018-01-31 08:35:53 +01:00
parent bb65b7c280
commit 37ff498e7e
5 changed files with 237 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/blackmisc/countrylist.cpp
View File

@@ -25,7 +25,7 @@ namespace BlackMisc
CCountry CCountryList::findByIsoCode(const QString &isoCode) const
{
QString iso(isoCode.trimmed().toUpper());
const QString iso(isoCode.trimmed().toUpper());
if (!CCountry::isValidIsoCode(iso)) { return CCountry(); }
return IDatastoreObjectList::findByKey(isoCode);
}
@@ -35,7 +35,7 @@ namespace BlackMisc
if (countryName.isEmpty()) { return CCountry(); }
thread_local const QRegularExpression reg("^[a-z]+", QRegularExpression::CaseInsensitiveOption);
QRegularExpressionMatch match = reg.match(countryName);
const QRegularExpressionMatch match = reg.match(countryName);
const QString cn(match.hasMatch() ? match.captured(0) : countryName);
const CCountryList countries = this->findBy([&](const CCountry & country)
{
@@ -65,39 +65,68 @@ namespace BlackMisc
return CCountry();
}
QStringList CCountryList::toIsoNameList() const
QStringList CCountryList::toIsoNameList(bool sorted) const
{
QStringList sl;
for (const CCountry &country : (*this))
{
QString s = country.getCombinedStringIsoName();
const QString s = country.getCombinedStringIsoName();
if (s.isEmpty()) { continue; }
sl.append(s);
}
if (sorted) { sl.sort(); }
return sl;
}
QStringList CCountryList::toNameIsoList() const
QStringList CCountryList::toNameIsoList(bool sorted) const
{
QStringList sl;
for (const CCountry &country : (*this))
{
QString s = country.getCombinedStringNameIso();
const QString s = country.getCombinedStringNameIso();
if (s.isEmpty()) { continue; }
sl.append(s);
}
if (sorted) { sl.sort(); }
return sl;
}
QStringList CCountryList::toNameList() const
QStringList CCountryList::toNameList(bool sorted) const
{
QStringList sl;
for (const CCountry &country : (*this))
{
QString s = country.getName();
const QString s = country.getName();
if (s.isEmpty()) { continue; }
sl.append(s);
}
if (sorted) { sl.sort(); }
return sl;
}
QStringList CCountryList::toIsoList(bool sorted) const
{
QStringList sl;
for (const CCountry &country : (*this))
{
const QString s = country.getIsoCode();
if (s.length() != 2) { continue; }
sl.append(s);
}
if (sorted) { sl.sort(); }
return sl;
}
QStringList CCountryList::toIso3List(bool sorted) const
{
QStringList sl;
for (const CCountry &country : (*this))
{
const QString s = country.getIso3Code();
if (s.length() != 3) { continue; }
sl.append(s);
}
if (sorted) { sl.sort(); }
return sl;
}

13
src/blackmisc/countrylist.h
View File

@@ -53,18 +53,23 @@ namespace BlackMisc
CCountry findFirstByAlias(const QString &alias) const;
//! ISO/name string list
QStringList toIsoNameList() const;
QStringList toIsoNameList(bool sorted = false) const;
//! Name/ISO string list
QStringList toNameIsoList() const;
QStringList toNameIsoList(bool sorted = false) const;
//! Name string list
QStringList toNameList() const;
QStringList toNameList(bool sorted = false) const;
//! All ISO codes
QStringList toIsoList(bool sorted = false) const;
//! All ISO 3 codes
QStringList toIso3List(bool sorted = false) const;
//! From our database JSON format
static CCountryList fromDatabaseJson(const QJsonArray &array);
};
} //namespace
Q_DECLARE_METATYPE(BlackMisc::CCountryList)