From a38d1723bffcd20bc7011c0fe635636b936aa78b Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 30 Nov 2019 03:21:23 -0500
Subject: removed redundant categories now that there's a not filter disabled
 collapsing for filter, there's already a button to hide it

---
 src/modlistsortproxy.cpp | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

(limited to 'src/modlistsortproxy.cpp')

diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp
index 3bb02c0f..36dcae59 100644
--- a/src/modlistsortproxy.cpp
+++ b/src/modlistsortproxy.cpp
@@ -61,7 +61,7 @@ void ModListSortProxy::setCriteria(const std::vector<Criteria>& criteria)
   const bool changed = (criteria != m_Criteria);
   const bool isForUpdates = (
     !criteria.empty() &&
-    criteria[0].id == CategoryFactory::CATEGORY_SPECIAL_UPDATEAVAILABLE);
+    criteria[0].id == CategoryFactory::UpdateAvailable);
 
   if (changed || isForUpdates) {
     m_Criteria = criteria;
@@ -343,68 +343,56 @@ bool ModListSortProxy::categoryMatchesMod(
 
   switch (category)
   {
-    case CategoryFactory::CATEGORY_SPECIAL_CHECKED:
+    case CategoryFactory::Checked:
     {
       b = (enabled || info->alwaysEnabled());
       break;
     }
 
-    case CategoryFactory::CATEGORY_SPECIAL_UNCHECKED:
-    {
-      b = (!enabled && !info->alwaysEnabled());
-      break;
-    }
-
-    case CategoryFactory::CATEGORY_SPECIAL_UPDATEAVAILABLE:
+    case CategoryFactory::UpdateAvailable:
     {
       b = (info->updateAvailable() || info->downgradeAvailable());
       break;
     }
 
-    case CategoryFactory::CATEGORY_SPECIAL_NOCATEGORY:
+    case CategoryFactory::HasNoCategory:
     {
       b = (info->getCategories().size() == 0);
       break;
     }
 
-    case CategoryFactory::CATEGORY_SPECIAL_CONFLICT:
+    case CategoryFactory::Conflict:
     {
       b = (hasConflictFlag(info->getFlags()));
       break;
     }
 
-    case CategoryFactory::CATEGORY_SPECIAL_NOTENDORSED:
+    case CategoryFactory::NotEndorsed:
     {
       ModInfo::EEndorsedState state = info->endorsedState();
       b = (state != ModInfo::ENDORSED_TRUE);
       break;
     }
 
-    case CategoryFactory::CATEGORY_SPECIAL_BACKUP:
+    case CategoryFactory::Backup:
     {
       b = (info->hasFlag(ModInfo::FLAG_BACKUP));
       break;
     }
 
-    case CategoryFactory::CATEGORY_SPECIAL_MANAGED:
+    case CategoryFactory::Managed:
     {
       b = (!info->hasFlag(ModInfo::FLAG_FOREIGN));
       break;
     }
 
-    case CategoryFactory::CATEGORY_SPECIAL_UNMANAGED:
-    {
-      b = (info->hasFlag(ModInfo::FLAG_FOREIGN));
-      break;
-    }
-
-    case CategoryFactory::CATEGORY_SPECIAL_NOGAMEDATA:
+    case CategoryFactory::NoGameData:
     {
       b = (info->hasFlag(ModInfo::FLAG_INVALID));
       break;
     }
 
-    case CategoryFactory::CATEGORY_SPECIAL_NONEXUSID:
+    case CategoryFactory::NoNexusID:
     {
       b = (
         info->getNexusID() == -1 &&
-- 
cgit v1.3.1