diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-03-05 22:58:47 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 18:19:07 +0300 |
| commit | e2df38d868324f2a767d2109cdd8727acb866ca2 (patch) | |
| tree | 614b560431d2c61f3f2b1e2f986c7806bd175ae9 /mobile-widgets/qmlmanager.cpp | |
| parent | c22fd9f4fd6699333629b8acb1e9c135a9783082 (diff) | |
| download | subsurface-e2df38d868324f2a767d2109cdd8727acb866ca2.tar.gz | |
Dive site: add dive site ref-counting
Instead of setting dive->dive_site directly, call the
add_dive_to_dive_site() and unregister_dive_from_dive_site()
functions. In the parser this turned out to be a bit tricky.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'mobile-widgets/qmlmanager.cpp')
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index b8d83ef5d..d312fac00 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -775,7 +775,8 @@ static void setupDivesite(struct dive *d, struct dive_site *ds, double lat, doub if (ds) { ds->location = location; } else { - d->dive_site = create_dive_site_with_gps(locationtext, &location, &dive_site_table); + unregister_dive_from_dive_site(d); + add_dive_to_dive_site(d, create_dive_site_with_gps(locationtext, &location, &dive_site_table)); } } @@ -894,7 +895,8 @@ bool QMLManager::checkLocation(DiveObjectHelper *myDive, struct dive *d, QString ds = get_dive_site_by_name(qPrintable(location), &dive_site_table); if (!ds && !location.isEmpty()) ds = create_dive_site(qPrintable(location), &dive_site_table); - d->dive_site = ds; + unregister_dive_from_dive_site(d); + add_dive_to_dive_site(d, ds); } // now make sure that the GPS coordinates match - if the user changed the name but not // the GPS coordinates, this still does the right thing as the now new dive site will |