summaryrefslogtreecommitdiffstats
path: root/map-widget
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-11-17 18:13:55 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-11-19 21:13:40 -0800
commitb76f2071589d6a7f45ec2845afa8b49110da608b (patch)
tree1b7176f4bf706803160c9dc007a7c524dbc59bd2 /map-widget
parent6d6d10f03a92a9bac5394fc226c398af61f29d66 (diff)
downloadsubsurface-b76f2071589d6a7f45ec2845afa8b49110da608b.tar.gz
Filter: split out filter from model
Split out the actual filtering from the MultiFilterSortModel. Create a DiveFilter class that does the actual filtering. Currently, mobile and desktop have their own version of this class, though ultimately we may want to merge them. The idea here is that the trip-model and undo-commands have direct access to the filter-function and thus can take care of keeping track of the number of shown dives, etc. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'map-widget')
-rw-r--r--map-widget/qmlmapwidgethelper.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp
index 9dba8bfd3..ff5f47f35 100644
--- a/map-widget/qmlmapwidgethelper.cpp
+++ b/map-widget/qmlmapwidgethelper.cpp
@@ -7,10 +7,10 @@
#include "qmlmapwidgethelper.h"
#include "core/divesite.h"
#include "core/qthelper.h"
+#include "core/divefilter.h"
#include "qt-models/maplocationmodel.h"
#include "qt-models/divelocationmodel.h"
#ifndef SUBSURFACE_MOBILE
-#include "qt-models/filtermodels.h"
#include "desktop-widgets/mapwidget.h"
#endif
@@ -106,7 +106,7 @@ void MapWidgetHelper::updateEditMode()
// The filter being set to dive site is the signal that we are in dive site edit mode.
// This is the case when either the dive site edit tab or the dive site list tab are active.
bool old = m_editMode;
- m_editMode = MultiFilterSortModel::instance()->diveSiteMode();
+ m_editMode = DiveFilter::instance()->diveSiteMode();
if (old != m_editMode)
emit editModeChanged();
#endif