From aa1446bed2e485757f528b11a9a73a7b7f7f4c33 Mon Sep 17 00:00:00 2001 From: Salvador Cuñat Date: Thu, 7 Jul 2016 21:55:17 +0200 Subject: Make filters work again in master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since 6cd711a1 filters don't work. This went unnoticed because the commit wasn't applied on v4.5-branch. Partially reverting it makes filters work again. Signed-off-by: Salvador Cuñat Signed-off-by: Dirk Hohndel --- qt-models/filtermodels.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'qt-models') diff --git a/qt-models/filtermodels.cpp b/qt-models/filtermodels.cpp index b4aacf1bd..44b5daa61 100644 --- a/qt-models/filtermodels.cpp +++ b/qt-models/filtermodels.cpp @@ -2,6 +2,8 @@ #include "qt-models/models.h" #include "core/display.h" #include "qt-models/divetripmodel.h" +#include "desktop-widgets/divelistview.h" +#include "desktop-widgets/mainwindow.h" #include @@ -368,16 +370,9 @@ bool MultiFilterSortModel::filterAcceptsRow(int source_row, const QModelIndex &s void MultiFilterSortModel::myInvalidate() { - //WARNING: - //TODO: - // THIS CODE BELOW IS COMPLETELY BROKEN. I KNOW, I WROTE IT. - // REMOVE THIS, MAKE IT SANE. - // GRRRRR. - -#if 0 int i; struct dive *d; - // DiveListView *dlv = MainWindow::instance()->dive_list(); + DiveListView *dlv = MainWindow::instance()->dive_list(); divesDisplayed = 0; @@ -415,7 +410,6 @@ void MultiFilterSortModel::myInvalidate() if (curr_dive_site) { dlv->expandAll(); } -#endif } void MultiFilterSortModel::addFilterModel(MultiFilterInterface *model) -- cgit v1.2.3-70-g09d2