diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ set(AKONADI_CONTACT_VERSION "5.13.40") set(CALENDARSUPPORT_LIB_VERSION_LIB "5.13.40") -set(AKONADI_VERSION "5.13.40") +set(AKONADI_VERSION "5.13.41") set(AKONADI_SEARCH_VERSION "5.13.40") set(QT_REQUIRED_VERSION "5.12.0") diff --git a/src/jobtrackerfilterproxymodel.h b/src/jobtrackerfilterproxymodel.h --- a/src/jobtrackerfilterproxymodel.h +++ b/src/jobtrackerfilterproxymodel.h @@ -18,9 +18,9 @@ #ifndef JOBTRACKERFILTERPROXYMODEL_H #define JOBTRACKERFILTERPROXYMODEL_H -#include +#include -class JobTrackerFilterProxyModel : public KRecursiveFilterProxyModel +class JobTrackerFilterProxyModel : public QSortFilterProxyModel { Q_OBJECT public: @@ -32,7 +32,7 @@ void setShowOnlyFailed(bool showOnlyFailed); protected: - bool acceptRow(int source_row, const QModelIndex &source_parent) const override; + bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; private: int mSearchColumn; diff --git a/src/jobtrackerfilterproxymodel.cpp b/src/jobtrackerfilterproxymodel.cpp --- a/src/jobtrackerfilterproxymodel.cpp +++ b/src/jobtrackerfilterproxymodel.cpp @@ -21,18 +21,19 @@ #include JobTrackerFilterProxyModel::JobTrackerFilterProxyModel(QObject *parent) - : KRecursiveFilterProxyModel(parent), + : QSortFilterProxyModel(parent), mSearchColumn(-1), mShowOnlyFailed(false) { + setRecursiveFilteringEnabled(true); setDynamicSortFilter(true); } JobTrackerFilterProxyModel::~JobTrackerFilterProxyModel() { } -bool JobTrackerFilterProxyModel::acceptRow(int sourceRow, const QModelIndex &sourceParent) const +bool JobTrackerFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const { if (mShowOnlyFailed) { const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);