Merge pull request #1292 from Holt59/iplugin-isactive-refactoring

IPlugin::isActive refactoring

1 files changed, 6 insertions, 9 deletions

diff --git a/src/problemsdialog.cpp b/src/problemsdialog.cpp
index 4b944ed2..d72f8c20 100644
--- a/src/problemsdialog.cpp
+++ b/src/problemsdialog.cpp
@@ -7,12 +7,13 @@
 #include <QPushButton>

 #include <Shellapi.h>

 

+#include "plugincontainer.h"

 

 using namespace MOBase;

 

 

-ProblemsDialog::ProblemsDialog(std::vector<QObject *> pluginObjects, QWidget *parent) :

-  QDialog(parent), ui(new Ui::ProblemsDialog), m_PluginObjects(pluginObjects),

+ProblemsDialog::ProblemsDialog(const PluginContainer& pluginContainer, QWidget *parent) :

+  QDialog(parent), ui(new Ui::ProblemsDialog), m_PluginContainer(pluginContainer),

   m_hasProblems(false)

 {

   ui->setupUi(this);

@@ -40,14 +41,10 @@ void ProblemsDialog::runDiagnosis()
   m_hasProblems = false;

   ui->problemsWidget->clear();

 

-  for(QObject *pluginObj : m_PluginObjects) {

-    IPlugin *plugin = qobject_cast<IPlugin*>(pluginObj);

-    if (plugin != nullptr && !plugin->isActive())

-      continue;

-

-    IPluginDiagnose *diagnose = qobject_cast<IPluginDiagnose*>(pluginObj);

-    if (diagnose == nullptr)

+  for (IPluginDiagnose *diagnose : m_PluginContainer.plugins<IPluginDiagnose>()) {

+    if (!m_PluginContainer.isEnabled(diagnose)) {

       continue;

+    }

 

     std::vector<unsigned int> activeProblems = diagnose->activeProblems();

     foreach (unsigned int key, activeProblems) {