From 8673d2eada6aa985381424b9a32229e3ca371023 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 31 May 2016 17:04:37 +0200 Subject: [PATCH] refs #649, use utility function to emit signal (can be better traced in debugger) --- src/blackmisc/simulation/data/modelcaches.cpp | 5 +++++ src/blackmisc/simulation/data/modelcaches.h | 22 +++++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/blackmisc/simulation/data/modelcaches.cpp b/src/blackmisc/simulation/data/modelcaches.cpp index d8b50c1d6..0ec78ff47 100644 --- a/src/blackmisc/simulation/data/modelcaches.cpp +++ b/src/blackmisc/simulation/data/modelcaches.cpp @@ -26,6 +26,11 @@ namespace BlackMisc this->setCachedModels(models, simulator); } + void IMultiSimulatorModelCaches::emitCacheChanged(const CSimulatorInfo &simulator) + { + emit cacheChanged(simulator); + } + CAircraftModelList IMultiSimulatorModelCaches::getSyncronizedCachedModels(const CSimulatorInfo &simulator) { BLACK_VERIFY_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "need single simulator"); diff --git a/src/blackmisc/simulation/data/modelcaches.h b/src/blackmisc/simulation/data/modelcaches.h index e71bd2ad9..0cc3a2925 100644 --- a/src/blackmisc/simulation/data/modelcaches.h +++ b/src/blackmisc/simulation/data/modelcaches.h @@ -202,18 +202,22 @@ namespace BlackMisc //! \copydoc IModelsPerSimulatorSetable::setModels virtual void setModels(const BlackMisc::Simulation::CAircraftModelList &models, const BlackMisc::Simulation::CSimulatorInfo &simulator) override; - protected: - //! \name Cache has been changed - //! @{ - void changedFsx() { emit cacheChanged(BlackMisc::Simulation::CSimulatorInfo(BlackMisc::Simulation::CSimulatorInfo::FSX)); } - void changedFs9() { emit cacheChanged(BlackMisc::Simulation::CSimulatorInfo(BlackMisc::Simulation::CSimulatorInfo::FS9)); } - void changedP3D() { emit cacheChanged(BlackMisc::Simulation::CSimulatorInfo(BlackMisc::Simulation::CSimulatorInfo::P3D)); } - void changedXP() { emit cacheChanged(BlackMisc::Simulation::CSimulatorInfo(BlackMisc::Simulation::CSimulatorInfo::XPLANE)); } - //! @} - signals: //! Cache has been changed void cacheChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator); + + protected: + //! \name Cache has been changed + //! @{ + void changedFsx() { emitCacheChanged(BlackMisc::Simulation::CSimulatorInfo(BlackMisc::Simulation::CSimulatorInfo::FSX)); } + void changedFs9() { emitCacheChanged(BlackMisc::Simulation::CSimulatorInfo(BlackMisc::Simulation::CSimulatorInfo::FS9)); } + void changedP3D() { emitCacheChanged(BlackMisc::Simulation::CSimulatorInfo(BlackMisc::Simulation::CSimulatorInfo::P3D)); } + void changedXP() { emitCacheChanged(BlackMisc::Simulation::CSimulatorInfo(BlackMisc::Simulation::CSimulatorInfo::XPLANE)); } + //! @} + + private: + //! Emit cacheChanged() utility function (allows breakpoint) + void emitCacheChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator); }; //! Bundle of caches for all simulators