3 files changed, 24 insertions, 17 deletions

diff --git a/divelist.c b/divelist.c
index a3207b02c..e600a6cd2 100644
--- a/divelist.c
+++ b/divelist.c
@@ -846,6 +846,24 @@ void deselect_dive(int idx)
 	}
 }
 
+void deselect_dives_in_trip(struct dive_trip *trip)
+{
+	struct dive *dive;
+	if (!trip)
+		return;
+	for (dive = trip->dives; dive; dive = dive->next)
+		deselect_dive(get_divenr(dive));
+}
+
+void select_dives_in_trip(struct dive_trip *trip)
+{
+	struct dive *dive;
+	if (!trip)
+		return;
+	for (dive = trip->dives; dive; dive = dive->next)
+		select_dive(get_divenr(dive));
+}
+
 void mark_divelist_changed(int changed)
 {
 	dive_list_changed = changed;
diff --git a/divelist.h b/divelist.h
index 57f62fa11..389a26930 100644
--- a/divelist.h
+++ b/divelist.h
@@ -30,6 +30,8 @@ extern struct dive *merge_two_dives(struct dive *a, struct dive *b);
 extern bool consecutive_selected();
 extern void select_dive(int idx);
 extern void deselect_dive(int idx);
+extern void select_dives_in_trip(struct dive_trip *trip);
+extern void deselect_dives_in_trip(struct dive_trip *trip);
 extern void find_new_trip_start_time(dive_trip_t *trip);
 extern struct dive *first_selected_dive();
 extern struct dive *last_selected_dive();
diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp
index c541783cc..91b3dadf5 100644
--- a/qt-ui/divelistview.cpp
+++ b/qt-ui/divelistview.cpp
@@ -455,18 +455,10 @@ void DiveListView::selectionChanged(const QItemSelection &selected, const QItemS
 			continue;
 		const QAbstractItemModel *model = index.model();
 		struct dive *dive = (struct dive *)model->data(index, DiveTripModel::DIVE_ROLE).value<void *>();
-		if (!dive) { // it's a trip!
-			//TODO: deselect_trip_dives on c-code?
-			if (model->rowCount(index)) {
-				struct dive *child = (struct dive *)model->data(index.child(0, 0), DiveTripModel::DIVE_ROLE).value<void *>();
-				while (child) {
-					deselect_dive(get_divenr(child));
-					child = child->next;
-				}
-			}
-		} else {
+		if (!dive) // it's a trip!
+			deselect_dives_in_trip((dive_trip_t *)model->data(index, DiveTripModel::TRIP_ROLE).value<void *>());
+		else
 			deselect_dive(get_divenr(dive));
-		}
 	}
 	Q_FOREACH (const QModelIndex &index, newSelected.indexes()) {
 		if (index.column() != 0)
@@ -475,14 +467,9 @@ void DiveListView::selectionChanged(const QItemSelection &selected, const QItemS
 		const QAbstractItemModel *model = index.model();
 		struct dive *dive = (struct dive *)model->data(index, DiveTripModel::DIVE_ROLE).value<void *>();
 		if (!dive) { // it's a trip!
-			//TODO: select_trip_dives on C code?
 			if (model->rowCount(index)) {
 				QItemSelection selection;
-				struct dive *child = (struct dive *)model->data(index.child(0, 0), DiveTripModel::DIVE_ROLE).value<void *>();
-				while (child) {
-					select_dive(get_divenr(child));
-					child = child->next;
-				}
+				select_dives_in_trip((dive_trip_t *)model->data(index, DiveTripModel::TRIP_ROLE).value<void *>());
 				selection.select(index.child(0, 0), index.child(model->rowCount(index) - 1, 0));
 				selectionModel()->select(selection, QItemSelectionModel::Select | QItemSelectionModel::Rows);
 				selectionModel()->setCurrentIndex(index, QItemSelectionModel::Select | QItemSelectionModel::NoUpdate);