From 602beb0da205af050951f2552e5a4e315d85138f Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Tue, 24 May 2016 16:45:14 +0200 Subject: [PATCH] Remove obsolete plugin storage Plugin storage was used before the value cache existed. With the value cache this is no longer used and can be removed. refs #660 --- src/blackcore/contextsimulatorimpl.cpp | 2 +- src/blackcore/pluginmanagersimulator.cpp | 32 ---------- src/blackcore/pluginmanagersimulator.h | 11 +--- src/blackcore/pluginmanagerweatherdata.h | 1 - src/blackcore/simulator.h | 3 - src/blackcore/simulatorcommon.cpp | 2 - src/blackcore/simulatorcommon.h | 3 - src/blackmisc/pluginstorageprovider.h | 63 ------------------- src/plugins/simulator/fs9/simulatorfs9.cpp | 6 +- src/plugins/simulator/fs9/simulatorfs9.h | 2 - .../simulator/fscommon/simulatorfscommon.cpp | 3 +- .../simulator/fscommon/simulatorfscommon.h | 1 - src/plugins/simulator/fsx/simulatorfsx.cpp | 3 +- src/plugins/simulator/fsx/simulatorfsx.h | 1 - .../simulator/fsx/simulatorfsxfactory.cpp | 3 +- .../simulator/fsx/simulatorfsxfactory.h | 1 - .../simulator/xplane/simulatorxplane.cpp | 6 +- .../simulator/xplane/simulatorxplane.h | 3 - 18 files changed, 9 insertions(+), 137 deletions(-) delete mode 100644 src/blackmisc/pluginstorageprovider.h diff --git a/src/blackcore/contextsimulatorimpl.cpp b/src/blackcore/contextsimulatorimpl.cpp index ca4be60f6..ceadfa8ea 100644 --- a/src/blackcore/contextsimulatorimpl.cpp +++ b/src/blackcore/contextsimulatorimpl.cpp @@ -342,7 +342,7 @@ namespace BlackCore Q_ASSERT(this->getIContextNetwork()->isUsingImplementingObject()); IOwnAircraftProvider *ownAircraftProvider = this->getRuntime()->getCContextOwnAircraft(); IRemoteAircraftProvider *renderedAircraftProvider = this->getRuntime()->getCContextNetwork(); - ISimulator *simulator = factory->create(simulatorInfo, ownAircraftProvider, renderedAircraftProvider, m_plugins, &m_weatherManager); + ISimulator *simulator = factory->create(simulatorInfo, ownAircraftProvider, renderedAircraftProvider, &m_weatherManager); Q_ASSERT_X(simulator, Q_FUNC_INFO, "no simulator driver can be created"); bool c = connect(simulator, &ISimulator::simulatorStatusChanged, this, &CContextSimulator::ps_onSimulatorStatusChanged); diff --git a/src/blackcore/pluginmanagersimulator.cpp b/src/blackcore/pluginmanagersimulator.cpp index 3cb6aaf90..2d8735ebd 100644 --- a/src/blackcore/pluginmanagersimulator.cpp +++ b/src/blackcore/pluginmanagersimulator.cpp @@ -27,38 +27,6 @@ namespace BlackCore { } - CVariant CPluginManagerSimulator::getPluginData(const QObject *obj, const QString &key) const - { - const QObject *p = obj; - while (p && !p->inherits("BlackCore::ISimulatorFactory")) - { - p = p->parent(); - } - - if (!p) return CVariant(); - - QString id = getIdByPlugin(p); - Q_ASSERT(!id.isEmpty()); - const PluginExtended &pe = m_plugins[id]; - return pe.storage.value(key); - } - - void CPluginManagerSimulator::setPluginData(const QObject *obj, const QString &key, const CVariant &value) - { - const QObject *p = obj; - while (p && !p->inherits("BlackCore::ISimulatorFactory")) - { - p = p->parent(); - } - - if (!p) return; - - QString id = getIdByPlugin(p); - Q_ASSERT(!id.isEmpty()); - PluginExtended &pe = m_plugins[id]; - pe.storage.insert(key, value); - } - ISimulatorFactory *CPluginManagerSimulator::getFactory(const QString &pluginId) { return getPluginById(pluginId); diff --git a/src/blackcore/pluginmanagersimulator.h b/src/blackcore/pluginmanagersimulator.h index fdd6efaea..c22b02e9e 100644 --- a/src/blackcore/pluginmanagersimulator.h +++ b/src/blackcore/pluginmanagersimulator.h @@ -14,7 +14,6 @@ #include "blackcore/blackcoreexport.h" #include "blackcore/pluginmanager.h" -#include "blackmisc/pluginstorageprovider.h" #include "blackmisc/sequence.h" #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/simulatorplugininfolist.h" @@ -34,8 +33,7 @@ namespace BlackCore * Manages plugins for the simulator context. */ class BLACKCORE_EXPORT CPluginManagerSimulator : - public BlackCore::IPluginManager, - public BlackMisc::IPluginStorageProvider + public BlackCore::IPluginManager { Q_OBJECT @@ -43,12 +41,6 @@ namespace BlackCore //! Ctor CPluginManagerSimulator(QObject *parent = nullptr); - //! \copydoc BlackMisc::IPluginStorageProvider::getPluginData - virtual BlackMisc::CVariant getPluginData(const QObject *obj, const QString &key) const override; - - //! \copydoc BlackMisc::IPluginStorageProvider::setPluginData - virtual void setPluginData(const QObject *obj, const QString &key, const BlackMisc::CVariant &value) override; - //! Get simulator factory from the plugin ISimulatorFactory *getFactory(const QString &pluginId); @@ -81,7 +73,6 @@ namespace BlackCore { BlackMisc::Simulation::CSimulatorPluginInfo info; ISimulatorListener *listener = nullptr; - QHash storage; //!< Permanent plugin storage - data stored here will be kept even when plugin is unloaded }; QMap m_plugins; //!< Id <-> extended data pairs diff --git a/src/blackcore/pluginmanagerweatherdata.h b/src/blackcore/pluginmanagerweatherdata.h index d3cf7107a..6ffe35ce2 100644 --- a/src/blackcore/pluginmanagerweatherdata.h +++ b/src/blackcore/pluginmanagerweatherdata.h @@ -62,7 +62,6 @@ namespace BlackCore struct PluginExtended { BlackMisc::Weather::CWeatherDataPluginInfo info; - QHash storage; //!< Permanent plugin storage - data stored here will be kept even when plugin is unloaded }; QMap m_plugins; //!< Id <-> extended data pairs diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 5bf62b2d0..808c3bdd1 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -31,7 +31,6 @@ namespace BlackMisc { - class IPluginStorageProvider; namespace Aviation { class CCallsign; } namespace Network { class CTextMessage; } namespace Simulation @@ -291,14 +290,12 @@ namespace BlackCore //! \param info metadata about simulator //! \param ownAircraftProvider in memory access to own aircraft data //! \param remoteAircraftProvider in memory access to rendered aircraft data such as situation history and aircraft itself - //! \param pluginStorageProvider in memory access to persistent plugin data store //! \param weatherGridProvider in memory access to weather grid data //! \return driver instance virtual ISimulator *create( const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::IPluginStorageProvider *pluginStorageProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) = 0; //! Simulator listener instance diff --git a/src/blackcore/simulatorcommon.cpp b/src/blackcore/simulatorcommon.cpp index a36caefa2..e36ac2b09 100644 --- a/src/blackcore/simulatorcommon.cpp +++ b/src/blackcore/simulatorcommon.cpp @@ -36,13 +36,11 @@ namespace BlackCore CSimulatorCommon::CSimulatorCommon(const CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - IPluginStorageProvider *pluginStorageProvider, IWeatherGridProvider *weatherGridProvider, QObject *parent) : ISimulator(parent), COwnAircraftAware(ownAircraftProvider), CRemoteAircraftAware(remoteAircraftProvider), - CPluginStorageAware(pluginStorageProvider), CWeatherGridAware(weatherGridProvider), m_simulatorPluginInfo(info) { diff --git a/src/blackcore/simulatorcommon.h b/src/blackcore/simulatorcommon.h index c6d88836a..6816e0ef2 100644 --- a/src/blackcore/simulatorcommon.h +++ b/src/blackcore/simulatorcommon.h @@ -21,7 +21,6 @@ #include "blackcore/simulator.h" #include "blackmisc/aviation/callsignset.h" #include "blackmisc/connectionguard.h" -#include "blackmisc/pluginstorageprovider.h" #include "blackmisc/pq/length.h" #include "blackmisc/pq/time.h" #include "blackmisc/pq/units.h" @@ -58,7 +57,6 @@ namespace BlackCore public BlackCore::ISimulator, public BlackMisc::Simulation::COwnAircraftAware, // gain access to in memory own aircraft data public BlackMisc::Simulation::CRemoteAircraftAware, // gain access to in memory remote aircraft data - public BlackMisc::CPluginStorageAware, // gain access to in memory plugin storage public BlackMisc::Weather::CWeatherGridAware // gain access to in memory weather grid { Q_OBJECT @@ -110,7 +108,6 @@ namespace BlackCore CSimulatorCommon(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::IPluginStorageProvider *pluginStorageProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, QObject *parent); diff --git a/src/blackmisc/pluginstorageprovider.h b/src/blackmisc/pluginstorageprovider.h deleted file mode 100644 index 39b23eef7..000000000 --- a/src/blackmisc/pluginstorageprovider.h +++ /dev/null @@ -1,63 +0,0 @@ -/* Copyright (C) 2015 - * swift project Community / Contributors - * - * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level - * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, - * including this file, may be copied, modified, propagated, or distributed except according to the terms - * contained in the LICENSE file. - */ - -//! \file - -#ifndef BLACKMISC_PLUGINSTORAGEPROVIDER_H -#define BLACKMISC_PLUGINSTORAGEPROVIDER_H - -#include "blackmisc/variant.h" -#include - -namespace BlackMisc -{ - //! Interface for a plugin storage provider. - //! It allows plugins to store any arbitrary data which can be packed into a \sa CVariant - //! Every plugin shall have its own data area. This means multiple plugins can store - //! data under the same key without overwriting each other. - class IPluginStorageProvider - { - public: - //! Destructor - virtual ~IPluginStorageProvider() {} - - //! Get plugin data stored for object and identified by key - virtual CVariant getPluginData(const QObject *obj, const QString &key) const = 0; - - //! Store plugin data for object, identified by key and packed into value - virtual void setPluginData(const QObject *obj, const QString &key, const CVariant &value) = 0; - }; - - //! Delegating class which can be directly used to access an \sa IPluginStorageProvider instance - class CPluginStorageAware - { - protected: - //! \copydoc IPluginStorageProvider::getPluginData - virtual CVariant getPluginData(const QObject *obj, const QString &key) const - { - return m_pluginStorageProvider->getPluginData(obj, key); - } - - //! \copydoc IPluginStorageProvider::setPluginData - virtual void setPluginData(const QObject *obj, const QString &key, const CVariant &value) - { - m_pluginStorageProvider->setPluginData(obj, key, value); - } - - //! Constructor - CPluginStorageAware(IPluginStorageProvider *pluginStorageProvider) : - m_pluginStorageProvider(pluginStorageProvider) - { - Q_ASSERT(pluginStorageProvider); - } - IPluginStorageProvider *m_pluginStorageProvider = nullptr; //!< access to object - }; -} // namespace - -#endif diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp index 2f4dfc627..f157d0822 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.cpp +++ b/src/plugins/simulator/fs9/simulatorfs9.cpp @@ -99,10 +99,9 @@ namespace BlackSimPlugin const QSharedPointer &lobbyClient, IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, - IPluginStorageProvider *pluginStorageProvider, IWeatherGridProvider *weatherGridProvider, QObject *parent) : - CSimulatorFsCommon(info, ownAircraftProvider, remoteAircraftProvider, pluginStorageProvider, weatherGridProvider, parent), + CSimulatorFsCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, parent), m_fs9Host(fs9Host), m_lobbyClient(lobbyClient) { @@ -450,10 +449,9 @@ namespace BlackSimPlugin const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, - IPluginStorageProvider *pluginStorageProvider, IWeatherGridProvider *weatherGridProvider) { - return new CSimulatorFs9(info, m_fs9Host, m_lobbyClient, ownAircraftProvider, remoteAircraftProvider, pluginStorageProvider, weatherGridProvider, this); + return new CSimulatorFs9(info, m_fs9Host, m_lobbyClient, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, this); } BlackCore::ISimulatorListener *CSimulatorFs9Factory::createListener(const CSimulatorPluginInfo &info) diff --git a/src/plugins/simulator/fs9/simulatorfs9.h b/src/plugins/simulator/fs9/simulatorfs9.h index 02c3c4b90..a1eeacc3c 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.h +++ b/src/plugins/simulator/fs9/simulatorfs9.h @@ -44,7 +44,6 @@ namespace BlackSimPlugin const QSharedPointer &lobbyClient, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::IPluginStorageProvider *pluginStorageProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, QObject *parent = nullptr); @@ -167,7 +166,6 @@ namespace BlackSimPlugin const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::IPluginStorageProvider *pluginStorageProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) override; //! \copydoc BlackCore::ISimulatorFactory::createListener diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.cpp b/src/plugins/simulator/fscommon/simulatorfscommon.cpp index b87a93829..81c6231d9 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.cpp +++ b/src/plugins/simulator/fscommon/simulatorfscommon.cpp @@ -27,10 +27,9 @@ namespace BlackSimPlugin const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *renderedAircraftProvider, - IPluginStorageProvider *pluginStorageProvider, Weather::IWeatherGridProvider *weatherGridProvider, QObject *parent) : - CSimulatorCommon(info, ownAircraftProvider, renderedAircraftProvider, pluginStorageProvider, weatherGridProvider, parent), + CSimulatorCommon(info, ownAircraftProvider, renderedAircraftProvider, weatherGridProvider, parent), m_fsuipc(new CFsuipc()) { } diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.h b/src/plugins/simulator/fscommon/simulatorfscommon.h index 3f48f26ee..2aa296206 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.h +++ b/src/plugins/simulator/fscommon/simulatorfscommon.h @@ -74,7 +74,6 @@ namespace BlackSimPlugin CSimulatorFsCommon(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *renderedAircraftProvider, - BlackMisc::IPluginStorageProvider *pluginStorageProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, QObject *parent = nullptr); diff --git a/src/plugins/simulator/fsx/simulatorfsx.cpp b/src/plugins/simulator/fsx/simulatorfsx.cpp index 2783fb22e..6eefda57a 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.cpp +++ b/src/plugins/simulator/fsx/simulatorfsx.cpp @@ -43,10 +43,9 @@ namespace BlackSimPlugin CSimulatorFsx::CSimulatorFsx(const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, - IPluginStorageProvider *pluginStorageProvider, IWeatherGridProvider *weatherGridProvider, QObject *parent) : - CSimulatorFsCommon(info, ownAircraftProvider, remoteAircraftProvider, pluginStorageProvider, weatherGridProvider, parent) + CSimulatorFsCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, parent) { Q_ASSERT_X(ownAircraftProvider, Q_FUNC_INFO, "Missing provider"); Q_ASSERT_X(remoteAircraftProvider, Q_FUNC_INFO, "Missing provider"); diff --git a/src/plugins/simulator/fsx/simulatorfsx.h b/src/plugins/simulator/fsx/simulatorfsx.h index c51a5f245..2a9b1b683 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.h +++ b/src/plugins/simulator/fsx/simulatorfsx.h @@ -78,7 +78,6 @@ namespace BlackSimPlugin const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::IPluginStorageProvider *pluginStorageProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, QObject *parent = nullptr); diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp index 627b939be..1a1d7f302 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp @@ -19,11 +19,10 @@ namespace BlackSimPlugin BlackCore::ISimulator *CSimulatorFsxFactory::create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::IPluginStorageProvider *pluginStorageProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) { Q_ASSERT(ownAircraftProvider); - return new CSimulatorFsx(info, ownAircraftProvider, remoteAircraftProvider, pluginStorageProvider, weatherGridProvider, this); + return new CSimulatorFsx(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, this); } BlackCore::ISimulatorListener *CSimulatorFsxFactory::createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.h b/src/plugins/simulator/fsx/simulatorfsxfactory.h index 736e04f32..777147a2f 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.h +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.h @@ -37,7 +37,6 @@ namespace BlackSimPlugin virtual BlackCore::ISimulator *create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::IPluginStorageProvider *pluginStorageProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) override; //! \copydoc BlackCore::ISimulatorFactory::createListener diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 88607755b..ee271ee39 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -83,10 +83,9 @@ namespace BlackSimPlugin CSimulatorXPlane::CSimulatorXPlane(const BlackMisc::Simulation::CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, - IPluginStorageProvider *pluginStorageProvider, IWeatherGridProvider *weatherGridProvider, QObject *parent) : - CSimulatorCommon(info, ownAircraftProvider, remoteAircraftProvider, pluginStorageProvider, weatherGridProvider, parent) + CSimulatorCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, parent) { m_watcher = new QDBusServiceWatcher(this); m_watcher->setWatchMode(QDBusServiceWatcher::WatchForUnregistration); @@ -640,10 +639,9 @@ namespace BlackSimPlugin BlackCore::ISimulator *CSimulatorXPlaneFactory::create(const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, - IPluginStorageProvider *pluginStorageProvider, IWeatherGridProvider *weatherGridProvider) { - return new CSimulatorXPlane(info, ownAircraftProvider, remoteAircraftProvider, pluginStorageProvider, weatherGridProvider, this); + return new CSimulatorXPlane(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, this); } CSimulatorXPlaneListener::CSimulatorXPlaneListener(const CSimulatorPluginInfo &info): ISimulatorListener(info) diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index 53610ac16..2eba67f89 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -39,7 +39,6 @@ class QTimer; namespace BlackMisc { - class IPluginStorageProvider; namespace Aviation { class CAircraftParts; @@ -75,7 +74,6 @@ namespace BlackSimPlugin CSimulatorXPlane(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::IPluginStorageProvider *pluginStorageProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, QObject *parent = nullptr); @@ -234,7 +232,6 @@ namespace BlackSimPlugin virtual BlackCore::ISimulator *create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::IPluginStorageProvider *pluginStorageProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) override; //! \copydoc BlackCore::ISimulatorFactory::createListener