From f6e7bdc5ef99d5a5fe71ac4f32511900fa82e804 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 26 Feb 2019 22:26:11 +0100 Subject: Dive site: add dive site table parameter to dive site functions To enable undo of dive site functions, it is crucial to work with different dive site tables. Therefore add a dive site table parameter to dive site functions. For now, always pass the global dive site table. Thus, this commit shouldn't alter any functionality. After this change, a simple search for dive_site_table reveals all places where the global dive site table is accessed. Signed-off-by: Berthold Stoeger --- desktop-widgets/tab-widgets/maintab.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'desktop-widgets/tab-widgets') diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index d1f13dd13..7f30c8962 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -658,7 +658,7 @@ struct dive_site *MainTab::updateDiveSite(struct dive_site *pickedDs, dive *d) if (pickedDs == RECENTLY_ADDED_DIVESITE) { QString name = ui.location->text().isEmpty() ? tr("New dive site") : ui.location->text(); - pickedDs = create_dive_site(qPrintable(name), displayed_dive.when); + pickedDs = create_dive_site(qPrintable(name), displayed_dive.when, &dive_site_table); createdNewDive = true; } @@ -856,7 +856,7 @@ void MainTab::acceptChanges() if (oldDs && !is_dive_site_used(oldDs, false)) { if (verbose) qDebug() << "delete now unused dive site" << (oldDs->name ? oldDs->name : "without name"); - delete_dive_site(oldDs); + delete_dive_site(oldDs, &dive_site_table); MapWidget::instance()->reload(); } // the code above can change the correct uuid for the displayed dive site - and the -- cgit v1.2.3-70-g09d2