From b397e0bc5d16de286075b09f2c95b3d059f9368b Mon Sep 17 00:00:00 2001
From: LostDragonist <lost.dragonist@gmail.com>
Date: Thu, 27 Dec 2018 04:37:23 -0600
Subject: Simplify code for visible counter changes

---
 src/mainwindow.cpp          | 14 +++-----------
 src/pluginlistsortproxy.cpp | 10 ++++++++--
 src/pluginlistsortproxy.h   |  2 ++
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c4c007f8..d11bf4b4 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3175,11 +3175,7 @@ void MainWindow::updateModCount()
     }
   }
 
-  if (m_ModListSortProxy->isFilterActive()) {
-    ui->activeModsCounter->display(visActiveCount);
-  } else {
-    ui->activeModsCounter->display(activeCount);
-  }
+  ui->activeModsCounter->display(visActiveCount);
   ui->activeModsCounter->setToolTip(tr("<table cellspacing=\"5\">"
     "<tr><th>Type</th><th>All</th><th>Visible</th>"
     "<tr><td>Enabled mods:&emsp;</td><td align=right>%1 / %2</td><td align=right>%3 / %4</td></tr>"
@@ -3215,7 +3211,7 @@ void MainWindow::updatePluginCount()
 
   for (QString plugin : list->pluginNames()) {
     bool active = list->isEnabled(plugin);
-    bool visible = plugin.contains(filter, Qt::CaseInsensitive);
+    bool visible = m_PluginListSortProxy->filterMatchesPlugin(plugin);
     if (list->isMaster(plugin)) {
       masterCount++;
       activeMasterCount += active;
@@ -3234,11 +3230,7 @@ void MainWindow::updatePluginCount()
   int activeCount = activeMasterCount + activeLightMasterCount + activeRegularCount;
   int totalCount = masterCount + lightMasterCount + regularCount;
 
-  if (!filter.isEmpty()) {
-    ui->activePluginsCounter->display(activeVisibleCount);
-  } else {
-    ui->activePluginsCounter->display(activeCount);
-  }
+  ui->activePluginsCounter->display(activeVisibleCount);
   ui->activePluginsCounter->setToolTip(tr("<table cellspacing=\"4\">"
     "<tr><th>Type</th><th>Active</th><th>Total</th></tr>"
     "<tr><td>Active plugins:</td><td align=right>%1</td><td align=right>%2</td></tr>"
diff --git a/src/pluginlistsortproxy.cpp b/src/pluginlistsortproxy.cpp
index e09e64a5..1e131c4d 100644
--- a/src/pluginlistsortproxy.cpp
+++ b/src/pluginlistsortproxy.cpp
@@ -72,8 +72,7 @@ void PluginListSortProxy::updateFilter(const QString &filter)
 
 bool PluginListSortProxy::filterAcceptsRow(int row, const QModelIndex&) const
 {
-  return m_CurrentFilter.isEmpty() ||
-      sourceModel()->data(sourceModel()->index(row, 0)).toString().contains(m_CurrentFilter, Qt::CaseInsensitive);
+  return filterMatchesPlugin(sourceModel()->data(sourceModel()->index(row, 0)).toString());
 }
 
 
@@ -137,3 +136,10 @@ bool PluginListSortProxy::dropMimeData(const QMimeData *data, Qt::DropAction act
                                              sourceIndex.parent());
 }
 
+
+bool PluginListSortProxy::filterMatchesPlugin(const QString &plugin) const
+{
+  return m_CurrentFilter.isEmpty() ||
+      plugin.contains(m_CurrentFilter, Qt::CaseInsensitive);
+}
+
diff --git a/src/pluginlistsortproxy.h b/src/pluginlistsortproxy.h
index 89f60e70..03b079e2 100644
--- a/src/pluginlistsortproxy.h
+++ b/src/pluginlistsortproxy.h
@@ -46,6 +46,8 @@ public:
 
   virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
 
+  bool filterMatchesPlugin(const QString &plugin) const;
+
 public slots:
 
   void updateFilter(const QString &filter);
-- 
cgit v1.3.1