From 1b744c7639fe1c9cbaa22ae16b60dc48dc1e8944 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Tue, 28 Mar 2017 15:04:35 +0200 Subject: Always show notes when replanning ... as per popular request. Plus adding const keyword to constant strings. Signed-off-by: Robert C. Helling --- qt-models/diveplannermodel.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'qt-models') diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index c35471a44..bd90e4dfb 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -873,7 +873,7 @@ void DivePlannerPointsModel::createPlan(bool replanCopy) setRecalc(oldRecalc); //TODO: C-based function here? - bool did_deco = plan(&diveplan, &cache, isPlanner(), true); + plan(&diveplan, &cache, isPlanner(), true); free(cache); if (!current_dive || displayed_dive.id != current_dive->id) { // we were planning a new dive, not re-planning an existing on @@ -896,8 +896,7 @@ void DivePlannerPointsModel::createPlan(bool replanCopy) QString oldnotes(current_dive->notes); if (oldnotes.indexOf(QString(disclaimer).left(40)) >= 0) oldnotes.truncate(oldnotes.indexOf(QString(displayed_dive.notes).left(40))); - if (did_deco) - oldnotes.append(displayed_dive.notes); + oldnotes.append(displayed_dive.notes); displayed_dive.notes = strdup(oldnotes.toUtf8().data()); } copy_dive(&displayed_dive, current_dive); -- cgit v1.2.3-70-g09d2