Undo: use dive * instead of unique index in renumber-dives

Now, that pointers to dives are stable, we might just as well
use dive * instead of the unique-id. This also affects the
merge-dive command, as this uses the same renumbering machinery.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 6 insertions, 6 deletions

diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp
index 1df69e7bb..6d15da475 100644
--- a/desktop-widgets/simplewidgets.cpp
+++ b/desktop-widgets/simplewidgets.cpp
@@ -161,14 +161,14 @@ void RenumberDialog::buttonClicked(QAbstractButton *button)
 	if (ui.buttonBox->buttonRole(button) == QDialogButtonBox::AcceptRole) {
 		MainWindow::instance()->dive_list()->rememberSelection();
 		// we remember a list from dive uuid to a new number
-		QVector<QPair<int, int>> renumberedDives;
+		QVector<QPair<dive *, int>> renumberedDives;
 		int i;
 		int newNr = ui.spinBox->value();
-		struct dive *dive = NULL;
-		for_each_dive (i, dive) {
-			if (!selectedOnly || dive->selected) {
-				invalidate_dive_cache(dive);
-				renumberedDives.append(QPair<int, int>(dive->id, newNr++));
+		struct dive *d;
+		for_each_dive (i, d) {
+			if (!selectedOnly || d->selected) {
+				invalidate_dive_cache(d);
+				renumberedDives.append({ d, newNr++ });
 			}
 		}
 		Command::renumberDives(renumberedDives);