diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-02-26 22:26:11 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 18:19:07 +0300 |
| commit | f6e7bdc5ef99d5a5fe71ac4f32511900fa82e804 (patch) | |
| tree | 398efefad3b84b33eb5e488bdfa5b2482f345cdd /desktop-widgets/tab-widgets/maintab.cpp | |
| parent | 36644dc9f7540886801bda6131dff36241d9e879 (diff) | |
| download | subsurface-f6e7bdc5ef99d5a5fe71ac4f32511900fa82e804.tar.gz | |
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 <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/tab-widgets/maintab.cpp')
| -rw-r--r-- | desktop-widgets/tab-widgets/maintab.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |