From 2a083f9113cba628956bfc7079f61f5cbffee6dc Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 5 Jan 2017 02:23:25 +0100 Subject: [PATCH] refs #849, utility functions in model list added --- src/blackmisc/simulation/aircraftmodellist.cpp | 7 ++++++- src/blackmisc/simulation/aircraftmodellist.h | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp index ac6e89c54..ddf74db1b 100644 --- a/src/blackmisc/simulation/aircraftmodellist.cpp +++ b/src/blackmisc/simulation/aircraftmodellist.cpp @@ -68,7 +68,12 @@ namespace BlackMisc }); } - bool CAircraftModelList::containsModelsWithAircraftAndAirlineDesignator(const QString &aircraftDesignator, const QString &airlineDesignator) const + bool CAircraftModelList::containsModelsWithAircraftIcaoDesignator(const QString &aircraftDesignator) const + { + return this->contains(&CAircraftModel::getAircraftIcaoCodeDesignator, aircraftDesignator); + } + + bool CAircraftModelList::containsModelsWithAircraftAndAirlineIcaoDesignator(const QString &aircraftDesignator, const QString &airlineDesignator) const { return this->contains(&CAircraftModel::getAircraftIcaoCodeDesignator, aircraftDesignator, &CAircraftModel::getAirlineIcaoCodeDesignator, airlineDesignator); } diff --git a/src/blackmisc/simulation/aircraftmodellist.h b/src/blackmisc/simulation/aircraftmodellist.h index b0f48767b..48aceb5d2 100644 --- a/src/blackmisc/simulation/aircraftmodellist.h +++ b/src/blackmisc/simulation/aircraftmodellist.h @@ -74,8 +74,11 @@ namespace BlackMisc //! Contains given combined type bool containsCombinedType(const QString &combinedType) const; - //! Contains any model with aircraft and airline designator - bool containsModelsWithAircraftAndAirlineDesignator(const QString &aircraftDesignator, const QString &airlineDesignator) const; + //! Contains any model with aircraft ICAO designator + bool containsModelsWithAircraftIcaoDesignator(const QString &aircraftDesignator) const; + + //! Contains any model with aircraft and airline ICAO designator + bool containsModelsWithAircraftAndAirlineIcaoDesignator(const QString &aircraftDesignator, const QString &airlineDesignator) const; //! Find by model string //! \remark normally CAircraftModelList::findFirstByModelStringOrDefault would be used