flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

made strictness optional in CMeasurementUnit::unitFromSymbol

Browse Source 
refs #81
This commit is contained in:
Klaus Basan
2013-12-09 23:27:28 +00:00
committed by Mathew Sutcliffe
parent f247399575
commit c72e8a4a27
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/blackmisc/pqbase.h
View File

@@ -380,9 +380,10 @@ namespace BlackMisc
/*!
* \brief Unit from symbol
* \param symbol must be a valid unit symbol (without i18n) or empty string (empty means default unit)
* \param strict strict check means if unit is not found, program terminates
* \return
*/
template <class U> static const U &unitFromSymbol(const QString &symbol)
template <class U> static const U &unitFromSymbol(const QString &symbol, bool strict = true)
{
if (symbol.isEmpty()) return U::defaultUnit();
const QList<U> &units = U::allUnits();
@@ -390,8 +391,24 @@ namespace BlackMisc
{
if (units.at(i).getSymbol() == symbol) return units.at(i);
}
qFatal("Illegal unit name");
return U::defaultUnit(); // just suppress "not all control paths return a value"
if (strict) qFatal("Illegal unit name");
return U::defaultUnit();
}
/*!
* \brief Valid unit symbol
* \param symbol must be a valid unit symbol (without i18n) or empty string (empty means default unit)
* \return
*/
template <class U> static bool isValidUnitSymbol(const QString &symbol)
{
if (symbol.isEmpty()) return false;
const QList<U> &units = U::allUnits();
for (int i = 0; i < units.size(); ++i)
{
if (units.at(i).getSymbol() == symbol) return true;
}
return false;
}
/*!