2 files changed, 1 insertions, 47 deletions

diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp
index 326e82d5a..f1c816e63 100644
--- a/desktop-widgets/divelistview.cpp
+++ b/desktop-widgets/divelistview.cpp
@@ -31,7 +31,7 @@
 #include "desktop-widgets/mapwidget.h"
 
 DiveListView::DiveListView(QWidget *parent) : QTreeView(parent), mouseClickSelection(false),
-	currentLayout(DiveTripModelBase::TREE), selectionSaved(false),
+	currentLayout(DiveTripModelBase::TREE),
 	initialColumnWidths(DiveTripModelBase::COLUMNS, 50)	// Set up with default length 50
 {
 	setItemDelegate(new DiveListDelegate(this));
@@ -239,47 +239,6 @@ void DiveListView::rowsInserted(const QModelIndex &parent, int start, int end)
 	}
 }
 
-// this only remembers dives that were selected, not trips
-void DiveListView::rememberSelection()
-{
-	selectedDives.clear();
-	QItemSelection selection = selectionModel()->selection();
-	Q_FOREACH (const QModelIndex &index, selection.indexes()) {
-		if (index.column() != 0) // We only care about the dives, so, let's stick to rows and discard columns.
-			continue;
-		struct dive *d = index.data(DiveTripModelBase::DIVE_ROLE).value<struct dive *>();
-		if (d) {
-			selectedDives.insert(d->divetrip, get_divenr(d));
-		} else {
-			struct dive_trip *t = index.data(DiveTripModelBase::TRIP_ROLE).value<dive_trip *>();
-			if (t)
-				selectedDives.insert(t, -1);
-		}
-	}
-	selectionSaved = true;
-}
-
-void DiveListView::restoreSelection()
-{
-	if (!selectionSaved)
-		return;
-
-	selectionSaved = false;
-	QList<int> divesToSelect;
-	Q_FOREACH (dive_trip_t *trip, selectedDives.keys()) {
-		QList<int> divesOnTrip = getDivesInTrip(trip);
-		QList<int> selectedDivesOnTrip = selectedDives.values(trip);
-
-		// Only select trip if all of its dives were selected
-		if(selectedDivesOnTrip.contains(-1)) {
-			selectTrip(trip);
-			selectedDivesOnTrip.removeAll(-1);
-		}
-		divesToSelect += selectedDivesOnTrip;
-	}
-	selectDives(divesToSelect);
-}
-
 // This is a bit ugly: we hook directly into the tripChanged signal to
 // select the trip if it was edited. This feels like a layering violation:
 // Shouldn't the core-layer call us?
diff --git a/desktop-widgets/divelistview.h b/desktop-widgets/divelistview.h
index f7676c58a..9cb2bd66a 100644
--- a/desktop-widgets/divelistview.h
+++ b/desktop-widgets/divelistview.h
@@ -34,8 +34,6 @@ public:
 	void selectDive(QModelIndex index, bool scrollto = false, bool toggle = false);
 	void selectDive(int dive_table_idx, bool scrollto = false, bool toggle = false);
 	void selectDives(const QList<int> &newDiveSelection);
-	void rememberSelection();
-	void restoreSelection();
 	void contextMenuEvent(QContextMenuEvent *event);
 	QList<dive_trip *> selectedTrips();
 	static QString lastUsedImageDir();
@@ -76,12 +74,9 @@ private:
 	DiveTripModelBase::Layout currentLayout;
 	QModelIndex contextMenuIndex;
 	bool dontEmitDiveChangedSignal;
-	bool selectionSaved;
 	// Remember the initial column widths, to avoid writing unchanged widths to the settings
 	QVector<int> initialColumnWidths;
 
-	/* if dive_trip_t is null, there's no problem. */
-	QMultiHash<dive_trip *, int> selectedDives;
 	void resetModel();	// Call after model changed
 	void merge_trip(const QModelIndex &a, const int offset);
 	void setColumnWidths();