Undo: make adding of planned dive undo-able

Planned dives were still added by directly calling core code.
This could confuse the undo-machinery, leading to crashes.

Instead, use the proper undo-command. The problem is that as
opposed to the other AddDive-commands, planned dives may
belong to a trip. Thus, the interface to the AddDive command
was changed to respect the divetrip field. Make sure that
the other callers reset that field (actually, it should never
be set). Add a comment describing the perhaps surprising
interface (the passed-in dive, usually displayed dive, is
reset).

Moreover, a dive cloned in the planner is not assigned a
new number. Thus, add an argument to the AddDive-command,
which expresses whether a new number should be generated
for the to-be-added dive.

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

1 files changed, 8 insertions, 3 deletions

diff --git a/desktop-widgets/command.h b/desktop-widgets/command.h
index 9a8ccfd6d..71ef2f9da 100644
--- a/desktop-widgets/command.h
+++ b/desktop-widgets/command.h
@@ -9,13 +9,18 @@
 // We put everything in a namespace, so that we can shorten names without polluting the global namespace
 namespace Command {
 
-// General commands
+// 1) General commands
+
 void clear();				// Reset the undo stack. Delete all commands.
 QAction *undoAction(QObject *parent);	// Create an undo action.
 QAction *redoAction(QObject *parent);	// Create an redo action.
 
-// Dive-list related commands
-void addDive(dive *d, bool autogroup);
+// 2) Dive-list related commands
+
+void addDive(dive *d, bool autogroup, bool newNumber); // If d->dive_trip is null and autogroup is true, dives within the auto-group
+						       // distance are added to a trip. dive d is consumed (the structure is reset)!
+						       // If newNumber is true, the dive is assigned a new number, depending on the
+						       // insertion position.
 void deleteDive(const QVector<struct dive*> &divesToDelete);
 void shiftTime(const QVector<dive *> &changedDives, int amount);
 void renumberDives(const QVector<QPair<dive *, int>> &divesToRenumber);