Update for extensions.

ModOrganizer2 · Jul 9, 2023 · a488364 · a488364
1 parent c7154aa
commit a488364
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 19 deletions.
diff --git a/src/instancemanagerdialog.cpp b/src/instancemanagerdialog.cpp
@@ -2,7 +2,6 @@
 #include "createinstancedialog.h"
 #include "filesystemutilities.h"
 #include "instancemanager.h"
-#include "plugincontainer.h"
 #include "selectiondialog.h"
 #include "settings.h"
 #include "shared/appconfig.h"

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -29,7 +29,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "modinfo.h"
 #include "modlistbypriorityproxy.h"
 #include "modlistsortproxy.h"
-#include "plugincontainer.h"  //class PluginManager;
 #include "shared/fileregisterfwd.h"
 #include "thememanager.h"
 #include "tutorialcontrol.h"

diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
@@ -27,7 +27,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "modinfodialogtextfiles.h"
 #include "modlistview.h"
 #include "organizercore.h"
-#include "plugincontainer.h"
 #include "shared/directoryentry.h"
 #include "shared/filesorigin.h"
 #include "ui_modinfodialog.h"

diff --git a/src/modinfodialogimages.h b/src/modinfodialogimages.h
@@ -4,7 +4,6 @@
 #include "filterwidget.h"
 #include "modinfodialogtab.h"
 #include "organizercore.h"
-#include "plugincontainer.h"
 #include <QScrollBar>
 
 using namespace MOBase;

diff --git a/src/modinforegular.cpp b/src/modinforegular.cpp
@@ -4,7 +4,6 @@
 #include "messagedialog.h"
 #include "moddatacontent.h"
 #include "organizercore.h"
-#include "plugincontainer.h"
 #include "report.h"
 #include "settings.h"
 #include <iplugingame.h>

diff --git a/src/pluginmanager.cpp b/src/pluginmanager.cpp
@@ -464,6 +464,8 @@ IPlugin* PluginManager::registerPlugin(const PluginExtension& extension,
 
 void PluginManager::loadPlugins()
 {
+  unloadPlugins();
+
   // TODO: order based on dependencies
   for (auto& extension : m_extensions.extensions()) {
     if (auto* pluginExtension = dynamic_cast<const PluginExtension*>(extension.get())) {
@@ -474,7 +476,7 @@ void PluginManager::loadPlugins()
 
 bool PluginManager::loadPlugins(const MOBase::PluginExtension& extension)
 {
-  unloadPlugins();
+  unloadPlugins(extension);
 
   // load plugins
   QList<QList<QObject*>> objects;
@@ -605,14 +607,13 @@ void PluginManager::unloadPlugins()
   m_supportedGames.clear();
 
   for (auto& loader : m_loaders) {
-    // TODO:
-    // loader->unloadAll();
+    loader->unloadAll();
   }
 }
 
 bool PluginManager::reloadPlugins(const MOBase::PluginExtension& extension)
 {
-  unloadPlugins(extension);
+  // load plugin already unload(), so no need to manually do it here
   return loadPlugins(extension);
 }
 

diff --git a/src/problemsdialog.cpp b/src/problemsdialog.cpp
@@ -7,8 +7,6 @@
 #include <iplugindiagnose.h>
 #include <utility.h>
 
-#include "plugincontainer.h"
-
 using namespace MOBase;
 
 ProblemsDialog::ProblemsDialog(const PluginManager& pluginManager, QWidget* parent)

diff --git a/src/settingsdialogplugins.cpp b/src/settingsdialogplugins.cpp
@@ -159,14 +159,14 @@ IPlugin* PluginsSettingsTab::plugin(QTreeWidgetItem* pluginItem) const
 void PluginsSettingsTab::update()
 {
   // transfer plugin settings to in-memory structure
-  for (int i = 0; i < ui->pluginsList->topLevelItemCount(); ++i) {
-    auto* topLevelItem = ui->pluginsList->topLevelItem(i);
-    for (int j = 0; j < topLevelItem->childCount(); ++j) {
-      auto* item = topLevelItem->child(j);
-      settings().plugins().setSettings(plugin(item)->name(),
-                                       item->data(0, SettingsRole).toMap());
-    }
-  }
+  // for (int i = 0; i < ui->pluginsList->topLevelItemCount(); ++i) {
+  //  auto* topLevelItem = ui->pluginsList->topLevelItem(i);
+  //  for (int j = 0; j < topLevelItem->childCount(); ++j) {
+  //    auto* item = topLevelItem->child(j);
+  //    settings().plugins().setSettings(plugin(item)->name(),
+  //                                     item->data(0, SettingsRole).toMap());
+  //  }
+  //}
 
   // set plugin blacklist
   QStringList names;