refs #614, using threadsafe version of getCopy and Doxygen

This commit is contained in:
Klaus Basan
2016-03-31 02:55:11 +02:00
parent c3355b1c9d
commit 057c88b0f2
2 changed files with 8 additions and 4 deletions

View File

@@ -85,10 +85,10 @@ namespace BlackMisc
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator"); Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
switch (simulator.getSimulator()) switch (simulator.getSimulator())
{ {
case CSimulatorInfo::FS9: return this->m_modelCacheFs9.get(); case CSimulatorInfo::FS9: return this->m_modelCacheFs9.getCopy();
case CSimulatorInfo::FSX: return this->m_modelCacheFsx.get(); case CSimulatorInfo::FSX: return this->m_modelCacheFsx.getCopy();
case CSimulatorInfo::P3D: return this->m_modelCacheP3D.get(); case CSimulatorInfo::P3D: return this->m_modelCacheP3D.getCopy();
case CSimulatorInfo::XPLANE: return this->m_modelCacheXP.get(); case CSimulatorInfo::XPLANE: return this->m_modelCacheXP.getCopy();
default: default:
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator"); Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
return CAircraftModelList(); return CAircraftModelList();

View File

@@ -116,12 +116,14 @@ namespace BlackMisc
CModelCaches(QObject *parent = nullptr); CModelCaches(QObject *parent = nullptr);
//! Models //! Models
//! \threadsafe
CAircraftModelList getModels(const BlackMisc::Simulation::CSimulatorInfo &simulator) const; CAircraftModelList getModels(const BlackMisc::Simulation::CSimulatorInfo &simulator) const;
//! Set models //! Set models
BlackMisc::CStatusMessage setModels(const BlackMisc::Simulation::CAircraftModelList &models, const BlackMisc::Simulation::CSimulatorInfo &simulator); BlackMisc::CStatusMessage setModels(const BlackMisc::Simulation::CAircraftModelList &models, const BlackMisc::Simulation::CSimulatorInfo &simulator);
//! Cache timestamp //! Cache timestamp
//! \threadsafe
QDateTime getCacheTimestamp(const BlackMisc::Simulation::CSimulatorInfo &simulator) const; QDateTime getCacheTimestamp(const BlackMisc::Simulation::CSimulatorInfo &simulator) const;
//! Syncronize //! Syncronize
@@ -146,12 +148,14 @@ namespace BlackMisc
CModelSetCaches(QObject *parent = nullptr); CModelSetCaches(QObject *parent = nullptr);
//! Models //! Models
//! \threadsafe
CAircraftModelList getModels(const BlackMisc::Simulation::CSimulatorInfo &simulator) const; CAircraftModelList getModels(const BlackMisc::Simulation::CSimulatorInfo &simulator) const;
//! Set models //! Set models
BlackMisc::CStatusMessage setModels(const BlackMisc::Simulation::CAircraftModelList &models, const BlackMisc::Simulation::CSimulatorInfo &simulator); BlackMisc::CStatusMessage setModels(const BlackMisc::Simulation::CAircraftModelList &models, const BlackMisc::Simulation::CSimulatorInfo &simulator);
//! Cache timestamp //! Cache timestamp
//! \threadsafe
QDateTime getCacheTimestamp(const BlackMisc::Simulation::CSimulatorInfo &simulator) const; QDateTime getCacheTimestamp(const BlackMisc::Simulation::CSimulatorInfo &simulator) const;
//! Syncronize //! Syncronize