Merge with branch1.2

1 files changed, 9 insertions, 0 deletions

diff --git a/src/modlistsortproxy.h b/src/modlistsortproxy.h
index ed98f71c..05392c0b 100644
--- a/src/modlistsortproxy.h
+++ b/src/modlistsortproxy.h
@@ -37,6 +37,12 @@ public:
     FILTER_OR

   };

 

+  enum FilterType {

+    TYPE_SPECIAL,

+    TYPE_CATEGORY,

+    TYPE_CONTENT

+  };

+

 public:

 

   explicit ModListSortProxy(Profile *profile, QObject *parent = 0);

@@ -45,6 +51,8 @@ public:
 

   void setCategoryFilter(const std::vector<int> &categories);

 

+  void setContentFilter(const std::vector<int> &content);

+

   virtual Qt::ItemFlags flags(const QModelIndex &modelIndex) const;

   virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action,

                             int row, int column, const QModelIndex &parent);

@@ -110,6 +118,7 @@ private:
   Profile *m_Profile;

 

   std::vector<int> m_CategoryFilter;

+  std::vector<int> m_ContentFilter;

   std::bitset<ModList::COL_LASTCOLUMN + 1> m_EnabledColumns;

   QString m_CurrentFilter;