diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-11-17 18:13:55 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-11-19 21:13:40 -0800 |
| commit | b76f2071589d6a7f45ec2845afa8b49110da608b (patch) | |
| tree | 1b7176f4bf706803160c9dc007a7c524dbc59bd2 /desktop-widgets/divelogexportdialog.cpp | |
| parent | 6d6d10f03a92a9bac5394fc226c398af61f29d66 (diff) | |
| download | subsurface-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 'desktop-widgets/divelogexportdialog.cpp')
| -rw-r--r-- | desktop-widgets/divelogexportdialog.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/desktop-widgets/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp index cf859e2b9..99f6eb8a8 100644 --- a/desktop-widgets/divelogexportdialog.cpp +++ b/desktop-widgets/divelogexportdialog.cpp @@ -11,6 +11,7 @@ #include "core/save-html.h" #include "core/settings/qPrefDisplay.h" #include "core/save-profiledata.h" +#include "core/divefilter.h" #include "core/divesite.h" #include "core/errorhelper.h" #include "core/file.h" @@ -134,10 +135,10 @@ static std::vector<const dive_site *> getDiveSitesToExport(bool selectedOnly) { std::vector<const dive_site *> res; - if (selectedOnly && MultiFilterSortModel::instance()->diveSiteMode()) { + if (selectedOnly && DiveFilter::instance()->diveSiteMode()) { // Special case in dive site mode: export all selected dive sites, // not the dive sites of selected dives. - QVector<dive_site *> sites = MultiFilterSortModel::instance()->filteredDiveSites(); + QVector<dive_site *> sites = DiveFilter::instance()->filteredDiveSites(); res.reserve(sites.size()); for (const dive_site *ds: sites) res.push_back(ds); |