refs #614, renamed function and helper function

This commit is contained in:
Klaus Basan
2016-04-05 16:18:51 +02:00
parent b567e2e57b
commit 1b0dda74a3
5 changed files with 12 additions and 3 deletions

View File

@@ -202,6 +202,12 @@ namespace BlackMisc
return s;
}
const QString CLivery::getStandardCode(const CAirlineIcaoCode &airline)
{
QString code(airline.getDesignator());
return code.isEmpty() ? "" : code.append('.').append(standardLiveryMarker());
}
const QString &CLivery::colorLiveryMarker()
{
static const QString s("_CC");

View File

@@ -154,6 +154,9 @@ namespace BlackMisc
//! Standard livery marker string
static const QString &standardLiveryMarker();
//! Standard code for
static const QString getStandardCode(const BlackMisc::Aviation::CAirlineIcaoCode &airline);
//! Color livery marker
static const QString &colorLiveryMarker();

View File

@@ -32,7 +32,7 @@ namespace BlackMisc
return false;
}
bool CAircraftModelList::containsModelStringOrId(const CAircraftModel &model, Qt::CaseSensitivity sensitivity) const
bool CAircraftModelList::containsModelStringOrDbKey(const CAircraftModel &model, Qt::CaseSensitivity sensitivity) const
{
for (const CAircraftModel &m : (*this))
{

View File

@@ -42,7 +42,7 @@ namespace BlackMisc
bool containsModelString(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;
//! Contains model with model string or id
bool containsModelStringOrId(const BlackMisc::Simulation::CAircraftModel &model, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;
bool containsModelStringOrDbKey(const BlackMisc::Simulation::CAircraftModel &model, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;
//! Find by model string
//! \remark normally CAircraftModelList::findFirstByModelString would be used