diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-10-23 13:29:04 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-29 00:09:31 +0000 |
| commit | d3a7c5448fe166444980ed41757c9e03d83ece2f (patch) | |
| tree | 7a2a4f05b808705cd27845335876184f87243b5c /mobile-widgets | |
| parent | ae6239bfec75df8a6795c2cc0017fcb0148e01e5 (diff) | |
| download | subsurface-d3a7c5448fe166444980ed41757c9e03d83ece2f.tar.gz | |
Dive site: return pointer to dive_site in create_dive_site_*()
This changes more of the dive-site interface to return pointers
instead of UUIDs. Currently, most call sites directly extract
UUIDs afterwards. Ultimately, the UUIDs will be generally replaced
by pointers, which will then simplify these callers.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'mobile-widgets')
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index c5c9469d9..0a10c640e 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); + d->dive_site_uuid = create_dive_site_with_gps(locationtext, &location, d->when)->uuid; } } @@ -879,8 +879,7 @@ bool QMLManager::checkLocation(DiveObjectHelper *myDive, struct dive *d, QString if (!ds) ds = get_dive_site_by_name(qPrintable(location)); if (!ds && !location.isEmpty()) { - uint32_t uuid = create_dive_site(qPrintable(location), d->when); - ds = get_dive_site_by_uuid(uuid); + ds = create_dive_site(qPrintable(location), d->when); } d->dive_site_uuid = ds ? ds->uuid : 0; } |