Removed duplicated method.

This patch removes a duplicated method: get_divenr and
get_index_for_dive. The two are exactly the same  ( if my
c is not broken, but I may be broken since I'm working like
crazy for almost 30h nonstop. ), so please take a good look
before applying this one.

[Dirk Hohndel: Tomaz took the slightly broken of the two implementations,
               so I switched that out for the correct one]

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

4 files changed, 14 insertions, 23 deletions

diff --git a/dive.c b/dive.c
index e4bec0314..558cdee30 100644
--- a/dive.c
+++ b/dive.c
@@ -2038,15 +2038,6 @@ struct dive *merge_dives(struct dive *a, struct dive *b, int offset, bool prefer
 	return res;
 }
 
-int get_index_for_dive(struct dive *dive) {
-	int i;
-	struct dive *d;
-	for_each_dive(i, d)
-		if (d == dive)
-			return i;
-	return -1;
-}
-
 struct dive *find_dive_including(timestamp_t when)
 {
 	int i;
diff --git a/dive.h b/dive.h
index 580610fcf..0014a3ae7 100644
--- a/dive.h
+++ b/dive.h
@@ -416,8 +416,6 @@ struct dive {
 	struct divecomputer dc;
 };
 
-extern int get_index_for_dive(struct dive *dive);
-
 static inline int dive_has_gps_location(struct dive *dive)
 {
 	return dive->latitude.udeg || dive->longitude.udeg;
diff --git a/divelist.c b/divelist.c
index 28d082029..9a1ab017f 100644
--- a/divelist.c
+++ b/divelist.c
@@ -368,10 +368,12 @@ static void add_dive_to_deco(struct dive *dive)
 
 int get_divenr(struct dive *dive)
 {
-	int divenr = -1;
-	while (++divenr < dive_table.nr && get_dive(divenr) != dive)
-		;
-	return divenr;
+	int i;
+	struct dive *d;
+	for_each_dive(i, d)
+		if (d == dive)
+			return i;
+	return -1;
 }
 
 static struct gasmix air = { .o2.permille = O2_IN_AIR };
@@ -787,8 +789,8 @@ struct dive *merge_two_dives(struct dive *a, struct dive *b)
 
 	if (!a || !b)
 		return NULL;
-	i = get_index_for_dive(a);
-	j = get_index_for_dive(b);
+	i = get_divenr(a);
+	j = get_divenr(b);
 	res = merge_dives(a, b, b->when - a->when, FALSE);
 	if (!res)
 		return NULL;
diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp
index 44bb78cae..91201c5b5 100644
--- a/qt-ui/divelistview.cpp
+++ b/qt-ui/divelistview.cpp
@@ -227,9 +227,9 @@ void DiveListView::reload(DiveTripModel::Layout layout, bool forceSort)
 
 	QSortFilterProxyModel *m = qobject_cast<QSortFilterProxyModel*>(model());
 	QAbstractItemModel *oldModel = m->sourceModel();
-	if (oldModel)
+	if (oldModel){
 		oldModel->deleteLater();
-
+	}
 	DiveTripModel *tripModel = new DiveTripModel(this);
 	tripModel->setLayout(layout);
 
@@ -347,12 +347,12 @@ void DiveListView::selectionChanged(const QItemSelection& selected, const QItemS
 				if (child && child->divetrip)
 					selectedTrips.remove(child->divetrip);
 				while (child) {
-					deselect_dive(get_index_for_dive(child));
+					deselect_dive(get_divenr(child));
 					child = child->next;
 				}
 			}
 		} else {
-			deselect_dive(get_index_for_dive(dive));
+			deselect_dive(get_divenr(dive));
 		}
 	}
 	Q_FOREACH(const QModelIndex& index, newSelected.indexes()) {
@@ -368,7 +368,7 @@ void DiveListView::selectionChanged(const QItemSelection& selected, const QItemS
 				if (child && child->divetrip)
 					selectedTrips.insert(child->divetrip);
 				while (child) {
-					select_dive(get_index_for_dive(child));
+					select_dive(get_divenr(child));
 					child = child->next;
 				}
 				selection.select(index.child(0,0), index.child(model->rowCount(index) -1 , 0));
@@ -378,7 +378,7 @@ void DiveListView::selectionChanged(const QItemSelection& selected, const QItemS
 					expand(index);
 			}
 		} else {
-			select_dive(get_index_for_dive(dive));
+			select_dive(get_divenr(dive));
 		}
 	}
 	QTreeView::selectionChanged(selectionModel()->selection(), newDeselected);