From 057c88b0f2eb75d92270a1ed19a1297e62edbc8d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 31 Mar 2016 02:55:11 +0200 Subject: [PATCH] refs #614, using threadsafe version of getCopy and Doxygen --- src/blackmisc/simulation/data/modelcaches.cpp | 8 ++++---- src/blackmisc/simulation/data/modelcaches.h | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/blackmisc/simulation/data/modelcaches.cpp b/src/blackmisc/simulation/data/modelcaches.cpp index 3c5d01aa8..892e646bf 100644 --- a/src/blackmisc/simulation/data/modelcaches.cpp +++ b/src/blackmisc/simulation/data/modelcaches.cpp @@ -85,10 +85,10 @@ namespace BlackMisc Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator"); switch (simulator.getSimulator()) { - case CSimulatorInfo::FS9: return this->m_modelCacheFs9.get(); - case CSimulatorInfo::FSX: return this->m_modelCacheFsx.get(); - case CSimulatorInfo::P3D: return this->m_modelCacheP3D.get(); - case CSimulatorInfo::XPLANE: return this->m_modelCacheXP.get(); + case CSimulatorInfo::FS9: return this->m_modelCacheFs9.getCopy(); + case CSimulatorInfo::FSX: return this->m_modelCacheFsx.getCopy(); + case CSimulatorInfo::P3D: return this->m_modelCacheP3D.getCopy(); + case CSimulatorInfo::XPLANE: return this->m_modelCacheXP.getCopy(); default: Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator"); return CAircraftModelList(); diff --git a/src/blackmisc/simulation/data/modelcaches.h b/src/blackmisc/simulation/data/modelcaches.h index a565b2cdf..f1672d8c8 100644 --- a/src/blackmisc/simulation/data/modelcaches.h +++ b/src/blackmisc/simulation/data/modelcaches.h @@ -116,12 +116,14 @@ namespace BlackMisc CModelCaches(QObject *parent = nullptr); //! Models + //! \threadsafe CAircraftModelList getModels(const BlackMisc::Simulation::CSimulatorInfo &simulator) const; //! Set models BlackMisc::CStatusMessage setModels(const BlackMisc::Simulation::CAircraftModelList &models, const BlackMisc::Simulation::CSimulatorInfo &simulator); //! Cache timestamp + //! \threadsafe QDateTime getCacheTimestamp(const BlackMisc::Simulation::CSimulatorInfo &simulator) const; //! Syncronize @@ -146,12 +148,14 @@ namespace BlackMisc CModelSetCaches(QObject *parent = nullptr); //! Models + //! \threadsafe CAircraftModelList getModels(const BlackMisc::Simulation::CSimulatorInfo &simulator) const; //! Set models BlackMisc::CStatusMessage setModels(const BlackMisc::Simulation::CAircraftModelList &models, const BlackMisc::Simulation::CSimulatorInfo &simulator); //! Cache timestamp + //! \threadsafe QDateTime getCacheTimestamp(const BlackMisc::Simulation::CSimulatorInfo &simulator) const; //! Syncronize