From 1e881d0b2f4ec615e09a6735a264b0b7cbe70226 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 20 May 2019 03:36:16 +0200 Subject: [PATCH] Removed useless reference to the QPluginLoader in the Plugin structure --- sdrbase/plugin/pluginmanager.cpp | 4 ++-- sdrbase/plugin/pluginmanager.h | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp index cb4568a05..9fce02b65 100644 --- a/sdrbase/plugin/pluginmanager.cpp +++ b/sdrbase/plugin/pluginmanager.cpp @@ -163,9 +163,9 @@ void PluginManager::loadPluginsDir(const QDir& dir) qWarning() << "PluginManager::loadPluginsDir: " << qPrintable(loader->errorString()); } - if (plugin != 0) + if (plugin) { - m_plugins.append(Plugin(fileName, loader, plugin)); + m_plugins.append(Plugin(fileName, plugin)); } else { diff --git a/sdrbase/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h index 8c41172e5..c2f71b797 100644 --- a/sdrbase/plugin/pluginmanager.h +++ b/sdrbase/plugin/pluginmanager.h @@ -42,12 +42,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) { } };