Merge branch 'Develop' into archive_conflicts_2

Updating to 2.1.7alpha1

1 files changed, 8 insertions, 2 deletions

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);

+}

+