From 75dac8906ec0e9b0d1a3cad24ab89bf033bafbf9 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Thu, 28 Nov 2019 15:49:49 +0100 Subject: [PATCH] Cleanup: remove toggle parameter from DiveListView::selectDive() This defaulted to false and no caller used anything different. Signed-off-by: Berthold Stoeger --- desktop-widgets/divelistview.cpp | 10 ++++------ desktop-widgets/divelistview.h | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp index f1c816e63..9a9bd3604 100644 --- a/desktop-widgets/divelistview.cpp +++ b/desktop-widgets/divelistview.cpp @@ -322,13 +322,11 @@ QList DiveListView::selectedTrips() return ret; } -void DiveListView::selectDive(QModelIndex idx, bool scrollto, bool toggle) +void DiveListView::selectDive(QModelIndex idx, bool scrollto) { if (!idx.isValid()) return; - QItemSelectionModel::SelectionFlags flags = toggle ? QItemSelectionModel::Toggle : QItemSelectionModel::Select; - flags |= QItemSelectionModel::Rows; - selectionModel()->setCurrentIndex(idx, flags); + selectionModel()->setCurrentIndex(idx, QItemSelectionModel::Select | QItemSelectionModel::Rows); if (idx.parent().isValid()) { setAnimated(false); expand(idx.parent()); @@ -341,7 +339,7 @@ void DiveListView::selectDive(QModelIndex idx, bool scrollto, bool toggle) selectionChangeDone(); } -void DiveListView::selectDive(int i, bool scrollto, bool toggle) +void DiveListView::selectDive(int i, bool scrollto) { if (i == -1) return; @@ -350,7 +348,7 @@ void DiveListView::selectDive(int i, bool scrollto, bool toggle) if (match.isEmpty()) return; QModelIndex idx = match.first(); - selectDive(idx, scrollto, toggle); + selectDive(idx, scrollto); } void DiveListView::selectDives(const QList &newDiveSelection) diff --git a/desktop-widgets/divelistview.h b/desktop-widgets/divelistview.h index 9cb2bd66a..f4738e346 100644 --- a/desktop-widgets/divelistview.h +++ b/desktop-widgets/divelistview.h @@ -31,8 +31,8 @@ public: bool eventFilter(QObject *, QEvent *); void unselectDives(); void clearTripSelection(); - void selectDive(QModelIndex index, bool scrollto = false, bool toggle = false); - void selectDive(int dive_table_idx, bool scrollto = false, bool toggle = false); + void selectDive(QModelIndex index, bool scrollto = false); + void selectDive(int dive_table_idx, bool scrollto = false); void selectDives(const QList &newDiveSelection); void contextMenuEvent(QContextMenuEvent *event); QList selectedTrips();