diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-10-26 17:03:54 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-29 00:09:31 +0000 |
| commit | 724055f0af4fb7cdb9f1570967fe4b34797f3419 (patch) | |
| tree | 6aab8c34e7d0a6df1d6fe84bc5794e8eb5404b7d /mobile-widgets | |
| parent | acd44467c1100a1a774cc644921b1dc33dca1266 (diff) | |
| download | subsurface-724055f0af4fb7cdb9f1570967fe4b34797f3419.tar.gz | |
Dive site: replace dive->dive_site_uuid by dive_site
Replace the UUID reference of struct dive by a pointer to dive_site.
This commit is rather large in lines, but nevertheless quite simple
since most of the UUID->pointer work was done in previous commits.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'mobile-widgets')
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 0a10c640e..81c8f324f 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -760,7 +760,7 @@ static void setupDivesite(struct dive *d, struct dive_site *ds, double lat, doub if (ds) { ds->location = location; } else { - d->dive_site_uuid = create_dive_site_with_gps(locationtext, &location, d->when)->uuid; + d->dive_site = create_dive_site_with_gps(locationtext, &location, d->when); } } @@ -881,7 +881,7 @@ bool QMLManager::checkLocation(DiveObjectHelper *myDive, struct dive *d, QString if (!ds && !location.isEmpty()) { ds = create_dive_site(qPrintable(location), d->when); } - d->dive_site_uuid = ds ? ds->uuid : 0; + d->dive_site = 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 |