From d3a7c5448fe166444980ed41757c9e03d83ece2f Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 23 Oct 2018 13:29:04 +0200 Subject: 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 --- mobile-widgets/qmlmanager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'mobile-widgets') 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; } -- cgit v1.2.3-70-g09d2