summaryrefslogtreecommitdiff
path: root/src/filterlist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/filterlist.cpp')
-rw-r--r--src/filterlist.cpp25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/filterlist.cpp b/src/filterlist.cpp
index d0c7199e..54853227 100644
--- a/src/filterlist.cpp
+++ b/src/filterlist.cpp
@@ -187,9 +187,9 @@ private:
}
};
-FilterList::FilterList(Ui::MainWindow* ui, OrganizerCore& core,
- CategoryFactory& factory)
- : ui(ui), m_core(core), m_factory(factory)
+
+FilterList::FilterList(Ui::MainWindow* ui, OrganizerCore* organizer, CategoryFactory* factory)
+ : ui(ui), m_Organizer(organizer), m_factory(factory)
{
auto* eventFilter = new CriteriaItemFilter(ui->filters, [&](auto* item, int dir) {
return cycleItem(item, dir);
@@ -274,15 +274,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);
}
}
@@ -294,8 +294,9 @@ 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()
@@ -332,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));
}
}
}