From a7132c4ff615e31650539fbd19855bd3605a32b8 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Sun, 12 Nov 2023 13:41:17 +0100 Subject: [PATCH] Remove PluginManager::disableDisplayPlugin This isn't called anywhere, and I believe the implementation is flawed anyway. While it tries to remove the plugin from the list, the plugin isn't shut down, or disconnected from events. This is likely to cause problems if it were to be used. --- libraries/plugins/src/plugins/PluginManager.cpp | 8 -------- libraries/plugins/src/plugins/PluginManager.h | 9 --------- 2 files changed, 17 deletions(-) diff --git a/libraries/plugins/src/plugins/PluginManager.cpp b/libraries/plugins/src/plugins/PluginManager.cpp index c1ca853563..e5cbbf1bb2 100644 --- a/libraries/plugins/src/plugins/PluginManager.cpp +++ b/libraries/plugins/src/plugins/PluginManager.cpp @@ -272,14 +272,6 @@ DisplayPluginList PluginManager::getAllDisplayPlugins() { return _displayPlugins; } -void PluginManager::disableDisplayPlugin(const QString& name) { - auto it = std::remove_if(_displayPlugins.begin(), _displayPlugins.end(), [&](const DisplayPluginPointer& plugin){ - return plugin->getName() == name; - }); - _displayPlugins.erase(it, _displayPlugins.end()); -} - - const InputPluginList& PluginManager::getInputPlugins() { static std::once_flag once; static auto deviceAddedCallback = [&](QString deviceName) { diff --git a/libraries/plugins/src/plugins/PluginManager.h b/libraries/plugins/src/plugins/PluginManager.h index c5ff80774c..c35db5a91e 100644 --- a/libraries/plugins/src/plugins/PluginManager.h +++ b/libraries/plugins/src/plugins/PluginManager.h @@ -107,15 +107,6 @@ public: */ void setPreferredDisplayPlugins(const QStringList& displays); - /** - * @brief Disable a display plugin. - * - * This removes the plugin from the plugins list. - * The plugin is not deinitialized, and events are not disconnected. - * @param name - */ - void disableDisplayPlugin(const QString& name); - /** * @brief Disable a list of displays *