From afde4dce0dc89e4ac7edbbffd5dd68a9ce96c5f1 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 12 Apr 2019 15:47:41 +0200 Subject: Filter: allow filtering multiple dive sites In the edit-dive-site tab the filter is switched to a particular mode where only dives at that site are shown. If we want to reuse this for the dive-site tab the mode has to be extended to allow for multiple dive sites. This is trivially done by replacing a pointer by a vector of pointers. Signed-off-by: Berthold Stoeger --- desktop-widgets/locationinformation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index e5e14fadb..d935c4145 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -184,7 +184,7 @@ void LocationInformationWidget::acceptChanges() MainWindow::instance()->setApplicationState("Default"); MapWidget::instance()->endGetDiveCoordinates(); MapWidget::instance()->repopulateLabels(); - MultiFilterSortModel::instance()->stopFilterDiveSite(); + MultiFilterSortModel::instance()->stopFilterDiveSites(); } void LocationInformationWidget::initFields(dive_site *ds) @@ -195,7 +195,7 @@ void LocationInformationWidget::initFields(dive_site *ds) updateLabels(); enableLocationButtons(dive_site_has_gps_location(ds)); QSortFilterProxyModel *m = qobject_cast(ui.diveSiteListView->model()); - MultiFilterSortModel::instance()->startFilterDiveSite(ds); + MultiFilterSortModel::instance()->startFilterDiveSites(QVector{ ds }); if (m) m->invalidate(); } else { -- cgit v1.2.3-70-g09d2