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

refs #614, renamed function and helper function

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/dbstashcomponent.cpp
View File

@@ -70,7 +70,7 @@ namespace BlackGui
CStatusMessage CDbStashComponent::validateStashModel(const CAircraftModel &model, bool allowReplace) const
{
if (!allowReplace && this->ui->tvp_StashAircraftModels->container().containsModelStringOrId(model))
if (!allowReplace && this->ui->tvp_StashAircraftModels->container().containsModelStringOrDbKey(model))
{
const QString msg("Model \"%1\" already stashed");
return CStatusMessage(validationCategories(), CStatusMessage::SeverityError, msg.arg(model.getModelString()));

6
src/blackmisc/aviation/livery.cpp
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");

3
src/blackmisc/aviation/livery.h
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();

2
src/blackmisc/simulation/aircraftmodellist.cpp
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))
{

2
src/blackmisc/simulation/aircraftmodellist.h
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