From 1b0dda74a3a40ce5858020cc3733d744d76ad16b Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 5 Apr 2016 16:18:51 +0200 Subject: [PATCH] refs #614, renamed function and helper function --- src/blackgui/components/dbstashcomponent.cpp | 2 +- src/blackmisc/aviation/livery.cpp | 6 ++++++ src/blackmisc/aviation/livery.h | 3 +++ src/blackmisc/simulation/aircraftmodellist.cpp | 2 +- src/blackmisc/simulation/aircraftmodellist.h | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/blackgui/components/dbstashcomponent.cpp b/src/blackgui/components/dbstashcomponent.cpp index 1eb3b28c8..3c8a8b98d 100644 --- a/src/blackgui/components/dbstashcomponent.cpp +++ b/src/blackgui/components/dbstashcomponent.cpp @@ -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())); diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp index fa1564702..288fee75f 100644 --- a/src/blackmisc/aviation/livery.cpp +++ b/src/blackmisc/aviation/livery.cpp @@ -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"); diff --git a/src/blackmisc/aviation/livery.h b/src/blackmisc/aviation/livery.h index 376d0a84f..dbfe48175 100644 --- a/src/blackmisc/aviation/livery.h +++ b/src/blackmisc/aviation/livery.h @@ -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(); diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp index 5d522ab53..22ca0a4b5 100644 --- a/src/blackmisc/simulation/aircraftmodellist.cpp +++ b/src/blackmisc/simulation/aircraftmodellist.cpp @@ -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)) { diff --git a/src/blackmisc/simulation/aircraftmodellist.h b/src/blackmisc/simulation/aircraftmodellist.h index 80d9bdef2..7db9565b2 100644 --- a/src/blackmisc/simulation/aircraftmodellist.h +++ b/src/blackmisc/simulation/aircraftmodellist.h @@ -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