Merge pull request #1092 from Holt59/mod-data-content

Use ModDataContent feature from GamePlugin

1 files changed, 7 insertions, 7 deletions

diff --git a/src/modlist.h b/src/modlist.h
index 4d456a9a..8c29300d 100644
--- a/src/modlist.h
+++ b/src/modlist.h
@@ -20,7 +20,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef MODLIST_H

 #define MODLIST_H

 

-

+#include "moddatacontent.h"

 #include "categories.h"

 #include "nexusinterface.h"

 #include "modinfo.h"

@@ -42,6 +42,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 class QSortFilterProxyModel;

 class PluginContainer;

+class OrganizerCore;

 

 /**

  * Model presenting an overview of the installed mod

@@ -78,7 +79,7 @@ public:
    * @brief constructor

    * @todo ensure this view works without a profile set, otherwise there are intransparent dependencies on the initialisation order

    **/

-  ModList(PluginContainer *pluginContainer, QObject *parent = nullptr);

+  ModList(PluginContainer *pluginContainer, OrganizerCore *parent);

 

   ~ModList();

 

@@ -282,11 +283,11 @@ private:
 

   QString getConflictFlagText(ModInfo::EConflictFlag flag, ModInfo::Ptr modInfo) const;

 

-  static QString getColumnToolTip(int column);

+  QString getColumnToolTip(int column) const;

 

-  QVariantList contentsToIcons(const std::vector<ModInfo::EContent> &content) const;

+  QVariantList contentsToIcons(const std::set<int> &contentIds) const;

 

-  QString contentsToToolTip(const std::vector<ModInfo::EContent> &contents) const;

+  QString contentsToToolTip(const std::set<int> &contentsIds) const;

 

   ModList::EColumn getEnabledColumn(int index) const;

 

@@ -328,6 +329,7 @@ private:
 

 private:

 

+  OrganizerCore *m_Organizer;

   Profile *m_Profile;

 

   NexusInterface *m_NexusInterface;

@@ -352,8 +354,6 @@ private:
   SignalModStateChanged m_ModStateChanged;

   SignalModMoved m_ModMoved;

 

-  std::map<ModInfo::EContent, std::tuple<QString, QString> > m_ContentIcons;

-

   QElapsedTimer m_LastCheck;

 

   PluginContainer *m_PluginContainer;