From 8b9b540c2283971a8ca0908f65b67183bb0f20ef Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 13 Jan 2017 04:36:44 +0100 Subject: [PATCH] refs #859, return bool flag if value was changed --- .../dbaircrafticaoselectorcomponent.cpp | 15 ++++++++++++--- .../components/dbaircrafticaoselectorcomponent.h | 8 +++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp index 3ebf6cbe1..4bb8c1d5f 100644 --- a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp +++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp @@ -58,7 +58,7 @@ namespace BlackGui CDbAircraftIcaoSelectorComponent::~CDbAircraftIcaoSelectorComponent() { } - void CDbAircraftIcaoSelectorComponent::setAircraftIcao(const CAircraftIcaoCode &icao) + bool CDbAircraftIcaoSelectorComponent::setAircraftIcao(const CAircraftIcaoCode &icao) { CAircraftIcaoCode setIcao(icao); if (!icao.isLoadedFromDb()) @@ -74,16 +74,25 @@ namespace BlackGui { m_currentIcao = setIcao; emit changedAircraftIcao(setIcao); + return true; + } + else + { + return false; } } - void CDbAircraftIcaoSelectorComponent::setAircraftIcao(int key) + bool CDbAircraftIcaoSelectorComponent::setAircraftIcao(int key) { const CAircraftIcaoCode icao(sGui->getWebDataServices()->getAircraftIcaoCodeForDbKey(key)); ui->lbl_Description->setText(""); if (icao.hasCompleteData()) { - this->setAircraftIcao(icao); + return this->setAircraftIcao(icao); + } + else + { + return false; } } diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.h b/src/blackgui/components/dbaircrafticaoselectorcomponent.h index 79236544d..3afbe21e9 100644 --- a/src/blackgui/components/dbaircrafticaoselectorcomponent.h +++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.h @@ -55,13 +55,15 @@ namespace BlackGui explicit CDbAircraftIcaoSelectorComponent(QWidget *parent = nullptr); //! Destructor - ~CDbAircraftIcaoSelectorComponent(); + virtual ~CDbAircraftIcaoSelectorComponent(); //! Current aircraft ICAO - void setAircraftIcao(const BlackMisc::Aviation::CAircraftIcaoCode &icao); + //! \return changed + bool setAircraftIcao(const BlackMisc::Aviation::CAircraftIcaoCode &icao); //! Current aircraft ICAO - void setAircraftIcao(int key); + //! \return changed + bool setAircraftIcao(int key); //! Distributor BlackMisc::Aviation::CAircraftIcaoCode getAircraftIcao() const;