Fix renumbering of dives

The implementation in commit 182fe790c9e8 ("Add ability to undo
renumbering of dives") looks perfectly reasonable, but it depends on an
implementation detail: it assumes that the keys of the QMap are returned
in the same order in which they were placed there. Which apparently isn't
the case for some version of Qt.

With this commit we simply remember both the old and the new number for
each dive and therefore the order in which they are processed doesn't
matter.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 2 insertions, 3 deletions

diff --git a/qt-ui/undocommands.h b/qt-ui/undocommands.h
index bd8530d77..62fb2d22b 100644
--- a/qt-ui/undocommands.h
+++ b/qt-ui/undocommands.h
@@ -28,13 +28,12 @@ private:
 
 class UndoRenumberDives : public QUndoCommand {
 public:
-	UndoRenumberDives(QMap<int,int> originalNumbers, int startNumber);
+	UndoRenumberDives(QMap<int, QPair<int, int> > originalNumbers);
 	virtual void undo();
 	virtual void redo();
 
 private:
-	QMap<int,int> oldNumbers;
-	int start;
+	QMap<int,QPair<int, int> > oldNumbers;
 };
 
 class UndoRemoveDivesFromTrip : public QUndoCommand {