From 35b8a4f404de3297cb8d126654e0ec37245a7537 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 23 Sep 2018 12:53:35 +0200 Subject: Core: split process_dives() in post-import and post-load versions process_dives() is used to post-process the dive table after loading or importing. The first parameter states whether this was after load or import. Especially in the light of undo, load and import are fundamentally different things. Notably, that latter should be undo-able, whereas the former is not. Therefore, as a first step to make import undo-able, split the function in two versions and remove the first parameter. It turns out the the load-version is very light. It only sets the DC nicknames and sorts the dive-table. There seems to be no reason to merge dives. Signed-off-by: Berthold Stoeger --- qt-models/diveimportedmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qt-models') diff --git a/qt-models/diveimportedmodel.cpp b/qt-models/diveimportedmodel.cpp index d8d486a13..48d9a1dcd 100644 --- a/qt-models/diveimportedmodel.cpp +++ b/qt-models/diveimportedmodel.cpp @@ -177,7 +177,7 @@ void DiveImportedModel::recordDives() diveTable->dives[i] = NULL; } diveTable->nr = 0; - process_dives(true, true); + process_imported_dives(true); if (autogroup) autogroup_dives(); } -- cgit v1.2.3-70-g09d2