Refactoring of game features for better management.

src/CMakeLists.txt

@@ -55,6 +55,7 @@ mo2_add_filter(NAME src/core GROUPS
 	nexusinterface
 	nxmaccessmanager
 	organizercore
+	game_features
 	plugincontainer
 	apiuseraccount
 	processrunner
@@ -196,6 +197,7 @@ mo2_add_filter(NAME src/profiles GROUPS
 
 mo2_add_filter(NAME src/proxies GROUPS
 	downloadmanagerproxy
+	gamefeaturesproxy
 	modlistproxy
 	organizerproxy
 	pluginlistproxy

src/activatemodsdialog.cpp

@@ -28,6 +28,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QtGlobal>
 
+using namespace MOBase;
+
 ActivateModsDialog::ActivateModsDialog(SaveGameInfo::MissingAssets const& missingAssets,
                                        QWidget* parent)
     : TutorableDialog("ActivateMods", parent), ui(new Ui::ActivateModsDialog)

src/activatemodsdialog.h

@@ -24,9 +24,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "tutorabledialog.h"
 
 #include <QObject>
-
-class QString;
-class QWidget;
+#include <QString>
+#include <QWidget>
 
 #include <set>
 
@@ -49,7 +48,7 @@ class ActivateModsDialog : public MOBase::TutorableDialog
    * @param missingPlugins a map containing missing plugins that need to be activated
    * @param parent ... Defaults to 0.
    **/
-  explicit ActivateModsDialog(SaveGameInfo::MissingAssets const& missingAssets,
+  explicit ActivateModsDialog(MOBase::SaveGameInfo::MissingAssets const& missingAssets,
                               QWidget* parent = 0);
   ~ActivateModsDialog();
 

src/directoryrefresher.cpp

@@ -22,9 +22,11 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "shared/filesorigin.h"
 
 #include "envfs.h"
+#include "game_features.h"
 #include "iplugingame.h"
 #include "modinfo.h"
 #include "modinfodialogfwd.h"
+#include "organizercore.h"
 #include "report.h"
 #include "settings.h"
 #include "shared/util.h"
@@ -159,8 +161,8 @@ void dumpStats(std::vector<DirectoryStats>& stats)
   ++run;
 }
 
-DirectoryRefresher::DirectoryRefresher(std::size_t threadCount)
-    : m_threadCount(threadCount), m_lastFileCount(0)
+DirectoryRefresher::DirectoryRefresher(OrganizerCore* core, std::size_t threadCount)
+    : m_Core(*core), m_threadCount(threadCount), m_lastFileCount(0)
 {}
 
 DirectoryEntry* DirectoryRefresher::stealDirectoryStructure()
@@ -204,11 +206,9 @@ void DirectoryRefresher::addModBSAToStructure(DirectoryEntry* root,
                                               const QString& directory,
                                               const QStringList& archives)
 {
-  const IPluginGame* game = qApp->property("managed_game").value<IPluginGame*>();
-
   QStringList loadOrder;
 
-  GamePlugins* gamePlugins = game->feature<GamePlugins>();
+  auto* gamePlugins = m_Core.gameFeatures().gameFeature<GamePlugins>();
   if (gamePlugins) {
     loadOrder = gamePlugins->getLoadOrder();
   }
@@ -320,6 +320,7 @@ void DirectoryRefresher::addModToStructure(DirectoryEntry* directoryStructure,
 
 struct ModThread
 {
+  GameFeatures* gameFeatures;
   DirectoryRefreshProgress* progress = nullptr;
   DirectoryEntry* ds                 = nullptr;
   std::wstring modName;
@@ -355,10 +356,8 @@ struct ModThread
     ds->addFromOrigin(walker, modName, path, prio, *stats);
 
     if (Settings::instance().archiveParsing()) {
-      const IPluginGame* game = qApp->property("managed_game").value<IPluginGame*>();
-
       QStringList loadOrder;
-      GamePlugins* gamePlugins = game->feature<GamePlugins>();
+      GamePlugins* gamePlugins = gameFeatures->gameFeature<GamePlugins>();
       if (gamePlugins) {
         loadOrder = gamePlugins->getLoadOrder();
       }
@@ -420,11 +419,12 @@ void DirectoryRefresher::addMultipleModsFilesToStructure(
       } else {
         auto& mt = g_threads.request();
 
-        mt.progress = progress;
-        mt.ds       = directoryStructure;
-        mt.modName  = e.modName.toStdWString();
-        mt.path     = QDir::toNativeSeparators(e.absolutePath).toStdWString();
-        mt.prio     = prio;
+        mt.gameFeatures = &m_Core.gameFeatures();
+        mt.progress     = progress;
+        mt.ds           = directoryStructure;
+        mt.modName      = e.modName.toStdWString();
+        mt.path         = QDir::toNativeSeparators(e.absolutePath).toStdWString();
+        mt.prio         = prio;
 
         mt.archives.clear();
         for (auto&& a : e.archives) {

src/directoryrefresher.h

@@ -30,6 +30,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <tuple>
 #include <vector>
 
+class OrganizerCore;
+
 /**
  * @brief used to asynchronously generate the virtual view of the combined data
  *directory
@@ -54,7 +56,7 @@ class DirectoryRefresher : public QObject
     int priority;
   };
 
-  DirectoryRefresher(std::size_t threadCount);
+  DirectoryRefresher(OrganizerCore* core, std::size_t threadCount);
 
   /**
    * @brief retrieve the updated directory structure
@@ -146,6 +148,8 @@ public slots:
   void refreshed();
 
 private:
+  OrganizerCore& m_Core;
+
   std::vector<EntryInfo> m_Mods;
   std::set<QString> m_EnabledArchives;
   std::unique_ptr<MOShared::DirectoryEntry> m_Root;