Commit aee422b0 authored by Ahmad Samir's avatar Ahmad Samir
Browse files

Replace KRecursiveFilterProxyModel with QSortFilterProxyModel

Summary:
KRecursiveFilterProxyModel was only needed to have recursive filtering, which
became available upstream since Qt 5.10.  Also increate min. required Qt version
to 5.10.

Test Plan: The code builds, and recursive filtering still works

Reviewers: #ark, elvisangelaccio, apol

Reviewed By: apol

Subscribers: apol, kde-frameworks-devel, kde-utils-devel

Tags: #ark

Maniphest Tasks: T12269

Differential Revision: https://phabricator.kde.org/D25631
parent ecda12e8
...@@ -7,7 +7,7 @@ set (KDE_APPLICATIONS_VERSION_MICRO "70") ...@@ -7,7 +7,7 @@ set (KDE_APPLICATIONS_VERSION_MICRO "70")
set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
project(ark VERSION ${KDE_APPLICATIONS_VERSION}) project(ark VERSION ${KDE_APPLICATIONS_VERSION})
set(QT_MIN_VERSION 5.8.0) set(QT_MIN_VERSION 5.10.0)
set(KF5_MIN_VERSION 5.44.0) set(KF5_MIN_VERSION 5.44.0)
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
......
...@@ -26,8 +26,10 @@ ...@@ -26,8 +26,10 @@
using namespace Kerfuffle; using namespace Kerfuffle;
ArchiveSortFilterModel::ArchiveSortFilterModel(QObject *parent) ArchiveSortFilterModel::ArchiveSortFilterModel(QObject *parent)
: KRecursiveFilterProxyModel(parent) : QSortFilterProxyModel(parent)
{ {
// always enable recursive fitlering
setRecursiveFilteringEnabled(true);
} }
ArchiveSortFilterModel::~ArchiveSortFilterModel() ArchiveSortFilterModel::~ArchiveSortFilterModel()
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#ifndef ARCHIVESORTFILTERMODEL_H #ifndef ARCHIVESORTFILTERMODEL_H
#define ARCHIVESORTFILTERMODEL_H #define ARCHIVESORTFILTERMODEL_H
#include <KRecursiveFilterProxyModel> #include <QSortFilterProxyModel>
class ArchiveSortFilterModel: public KRecursiveFilterProxyModel class ArchiveSortFilterModel: public QSortFilterProxyModel
{ {
Q_OBJECT Q_OBJECT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment