Merge with branch1.2

1 files changed, 8 insertions, 0 deletions

diff --git a/src/modlist.h b/src/modlist.h
index 3c33fd05..cf52b2ec 100644
--- a/src/modlist.h
+++ b/src/modlist.h
@@ -54,6 +54,7 @@ public:
   enum EColumn {

     COL_NAME,

     COL_FLAGS,

+    COL_CONTENT,

     COL_CATEGORY,

     COL_MODID,

     COL_VERSION,

@@ -101,6 +102,8 @@ public:
 

   void changeModPriority(int sourceIndex, int newPriority);

 

+  void setOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten);

+

   void modInfoAboutToChange(ModInfo::Ptr info);

   void modInfoChanged(ModInfo::Ptr info);

 

@@ -245,6 +248,8 @@ private:
 

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

 

+  ModList::EColumn getEnabledColumn(int index) const;

+

   QVariant categoryData(int categoryID, int column, int role) const;

   QVariant modData(int modID, int modelColumn, int role) const;

 

@@ -288,6 +293,9 @@ private:
 

   bool m_DropOnItems;

 

+  std::set<unsigned int> m_Overwrite;

+  std::set<unsigned int> m_Overwritten;

+

   TModInfoChange m_ChangeInfo;

 

   SignalModStateChanged m_ModStateChanged;