From 77a1c7c1f40fd9c884c4f6323ed30c1516c93c71 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 10 Feb 2020 19:34:55 +0100 Subject: [PATCH] Dive list: remove filtering in MultiFilterSortModel Since we're doing the filtering at the core, don't filter in the sort-model (which is now inappropriately named). Signed-off-by: Berthold Stoeger --- qt-models/filtermodels.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/qt-models/filtermodels.cpp b/qt-models/filtermodels.cpp index 4bf0efd6b..8d3cb800a 100644 --- a/qt-models/filtermodels.cpp +++ b/qt-models/filtermodels.cpp @@ -16,9 +16,6 @@ MultiFilterSortModel *MultiFilterSortModel::instance() MultiFilterSortModel::MultiFilterSortModel(QObject *parent) : QSortFilterProxyModel(parent) { resetModel(DiveTripModelBase::TREE); - setFilterKeyColumn(-1); // filter all columns - setFilterRole(DiveTripModelBase::SHOWN_ROLE); // Let the proxy-model known that is has to react to change events involving SHOWN_ROLE - setFilterCaseSensitivity(Qt::CaseInsensitive); } void MultiFilterSortModel::resetModel(DiveTripModelBase::Layout layout) @@ -62,9 +59,7 @@ void MultiFilterSortModel::currentDiveChangedSlot(QModelIndex index) bool MultiFilterSortModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const { - QAbstractItemModel *m = sourceModel(); - QModelIndex index0 = m->index(source_row, 0, source_parent); - return m->data(index0, DiveTripModelBase::SHOWN_ROLE).value(); + return true; } bool MultiFilterSortModel::lessThan(const QModelIndex &i1, const QModelIndex &i2) const