Ref T270, use QPointer with simulator map in context. The advantage is, that we can also detect if the simulator is deleted elsewhere.

This commit is contained in:
Klaus Basan
2018-05-16 21:34:14 +02:00
parent 35d78b641a
commit 89c16bad7f

View File

@@ -39,6 +39,7 @@
#include <QObject> #include <QObject>
#include <QPair> #include <QPair>
#include <QString> #include <QString>
#include <QPointer>
namespace BlackMisc namespace BlackMisc
{ {
@@ -233,7 +234,7 @@ namespace BlackCore
//! Load the last know model set //! Load the last know model set
void initByLastUsedModelSet(); void initByLastUsedModelSet();
QPair<BlackMisc::Simulation::CSimulatorPluginInfo, ISimulator *> m_simulatorPlugin; //!< Currently loaded simulator plugin QPair<BlackMisc::Simulation::CSimulatorPluginInfo, QPointer<ISimulator>> m_simulatorPlugin; //!< Currently loaded simulator plugin
CPluginManagerSimulator *m_plugins = nullptr; CPluginManagerSimulator *m_plugins = nullptr;
BlackMisc::CRegularThread m_listenersThread; //!< waiting for plugin BlackMisc::CRegularThread m_listenersThread; //!< waiting for plugin
CWeatherManager m_weatherManager { this }; CWeatherManager m_weatherManager { this };