From e80c0d2c60e53071632095322845c32c80767f6f Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 30 Oct 2020 21:28:11 +0100 Subject: filter: reset shown_dives in filter The shown_dives variable was reset by the dive_list code. Arguably, the filter should keep track of the number of shown dives, so move the resetting there. This means adding a new "reset()" member function to the filter and call that instead of "updateAll()" when the core data is reset. Signed-off-by: Berthold Stoeger --- qt-models/divetripmodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qt-models') diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp index a0385822c..358d032a6 100644 --- a/qt-models/divetripmodel.cpp +++ b/qt-models/divetripmodel.cpp @@ -706,7 +706,7 @@ DiveTripModelTree::DiveTripModelTree(QObject *parent) : DiveTripModelBase(parent void DiveTripModelTree::populate() { - DiveFilter::instance()->updateAll(); // The data was reset - update filter status. TODO: should this really be done here? + DiveFilter::instance()->reset(); // The data was reset - update filter status. TODO: should this really be done here? // we want this to be two calls as the second text is overwritten below by the lines starting with "\r" uiNotification(QObject::tr("populate data model")); @@ -1475,7 +1475,7 @@ DiveTripModelList::DiveTripModelList(QObject *parent) : DiveTripModelBase(parent void DiveTripModelList::populate() { - DiveFilter::instance()->updateAll(); // The data was reset - update filter status. TODO: should this really be done here? + DiveFilter::instance()->reset(); // The data was reset - update filter status. TODO: should this really be done here? // Fill model items.reserve(dive_table.nr); -- cgit v1.2.3-70-g09d2