From c24a37d011b692271cd52a92f025c71ac1498b7d Mon Sep 17 00:00:00 2001 From: Davide Gerhard Date: Wed, 22 May 2019 08:31:07 +0200 Subject: [PATCH] pluginmanager: remove append of pluginLoader on m_plugins. Seen that it is not used we can remove from the Plugin() object and delete the instance at the end. --- sdrbase/plugin/pluginmanager.cpp | 4 +++- sdrbase/plugin/pluginmanager.h | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp index 6c877cdc1..57591cfec 100644 --- a/sdrbase/plugin/pluginmanager.cpp +++ b/sdrbase/plugin/pluginmanager.cpp @@ -174,8 +174,10 @@ void PluginManager::loadPluginsDir(const QDir& dir) continue; } + delete(pluginLoader); + qInfo("PluginManager::loadPluginsDir: loaded plugin %s", qPrintable(fileName)); - m_plugins.append(Plugin(fileName, pluginLoader, instance)); + m_plugins.append(Plugin(fileName, instance)); } } } diff --git a/sdrbase/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h index b220bbdb9..a2accbdd6 100644 --- a/sdrbase/plugin/pluginmanager.h +++ b/sdrbase/plugin/pluginmanager.h @@ -25,12 +25,10 @@ public: struct Plugin { QString filename; - QPluginLoader* loader; PluginInterface* pluginInterface; - Plugin(const QString& _filename, QPluginLoader* pluginLoader, PluginInterface* _plugin) : + Plugin(const QString& _filename, PluginInterface* _plugin) : filename(_filename), - loader(pluginLoader), pluginInterface(_plugin) { } };