From 0811536e57bd88b7d89da87706bdeebc51e5aae4 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 29 Oct 2016 03:39:50 +0200 Subject: [PATCH] refs #791, new ctor by ICAO/livery --- src/blackmisc/simulation/aircraftmodel.cpp | 4 ++++ src/blackmisc/simulation/aircraftmodel.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index e93b7644a..d54079bb7 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -44,6 +44,10 @@ namespace BlackMisc m_modelString(model.trimmed().toUpper()), m_modelType(type) {} + CAircraftModel::CAircraftModel(const QString &model, CAircraftModel::ModelType type, const CAircraftIcaoCode &icao, const CLivery &livery) : + m_aircraftIcao(icao), m_livery(livery), m_modelString(model.trimmed().toUpper()), m_modelType(type) + {} + CAircraftModel::CAircraftModel(const QString &model, CAircraftModel::ModelType type, const QString &description, const CAircraftIcaoCode &icao, const Aviation::CLivery &livery) : m_aircraftIcao(icao), m_livery(livery), m_modelString(model.trimmed().toUpper()), m_description(description.trimmed()), m_modelType(type) {} diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h index ff4a499a9..1dd14895d 100644 --- a/src/blackmisc/simulation/aircraftmodel.h +++ b/src/blackmisc/simulation/aircraftmodel.h @@ -114,6 +114,9 @@ namespace BlackMisc //! Constructor. CAircraftModel(const QString &model, ModelType type); + //! Constructor. + CAircraftModel(const QString &model, ModelType type, const BlackMisc::Aviation::CAircraftIcaoCode &icao, const BlackMisc::Aviation::CLivery &livery); + //! Constructor. CAircraftModel(const QString &model, ModelType type, const QString &description, const BlackMisc::Aviation::CAircraftIcaoCode &icao, const BlackMisc::Aviation::CLivery &livery = BlackMisc::Aviation::CLivery());