From d2e48ed72e3526c08580d5c4b3531778267532c5 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Thu, 21 Sep 2023 17:43:29 -0500
Subject: Fix rebase issues

---
 src/filterlist.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'src/filterlist.cpp')

diff --git a/src/filterlist.cpp b/src/filterlist.cpp
index ba0671a7..c88945f8 100644
--- a/src/filterlist.cpp
+++ b/src/filterlist.cpp
@@ -188,9 +188,9 @@ private:
   }
 };
 
-
-FilterList::FilterList(Ui::MainWindow* ui, OrganizerCore* organizer, PluginContainer* pluginContainer, CategoryFactory* factory)
-  : ui(ui), m_Organizer(organizer), m_pluginContainer(pluginContainer), m_factory(factory)
+FilterList::FilterList(Ui::MainWindow* ui, OrganizerCore& core,
+                       CategoryFactory& factory)
+    : ui(ui), m_core(core), m_factory(factory)
 {
   auto* eventFilter = new CriteriaItemFilter(ui->filters, [&](auto* item, int dir) {
     return cycleItem(item, dir);
@@ -275,15 +275,15 @@ void FilterList::addContentCriteria()
 void FilterList::addCategoryCriteria(QTreeWidgetItem* root,
                                      const std::set<int>& categoriesUsed, int targetID)
 {
-  const auto count = static_cast<unsigned int>(m_factory->numCategories());
+  const auto count = static_cast<unsigned int>(m_factory.numCategories());
   for (unsigned int i = 1; i < count; ++i) {
-    if (m_factory->getParentID(i) == targetID) {
-      int categoryID = m_factory->getCategoryID(i);
+    if (m_factory.getParentID(i) == targetID) {
+      int categoryID = m_factory.getCategoryID(i);
       if (categoriesUsed.find(categoryID) != categoriesUsed.end()) {
         QTreeWidgetItem* item =
-          addCriteriaItem(root, m_factory->getCategoryName(i),
-            categoryID, ModListSortProxy::TypeCategory);
-        if (m_factory->hasChildren(i)) {
+            addCriteriaItem(root, m_factory.getCategoryName(i), categoryID,
+                            ModListSortProxy::TypeCategory);
+        if (m_factory.hasChildren(i)) {
           addCategoryCriteria(item, categoriesUsed, categoryID);
         }
       }
@@ -295,9 +295,8 @@ void FilterList::addSpecialCriteria(int type)
 {
   const auto sc = static_cast<CategoryFactory::SpecialCategories>(type);
 
-  addCriteriaItem(
-    nullptr, m_factory->getSpecialCategoryName(sc),
-    type, ModListSortProxy::TypeSpecial);
+  addCriteriaItem(nullptr, m_factory.getSpecialCategoryName(sc), type,
+                  ModListSortProxy::TypeSpecial);
 }
 
 void FilterList::refresh()
@@ -334,7 +333,7 @@ void FilterList::refresh()
           log::warn("cycle in categories: {}", SetJoin(cycleTest, ", "));
           break;
         }
-        currentID = m_factory->getParentID(m_factory->getCategoryIndex(currentID));
+        currentID = m_factory.getParentID(m_factory.getCategoryIndex(currentID));
       }
     }
   }
-- 
cgit v1.3.1