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 /core/gpslocation.cpp | |
| 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 'core/gpslocation.cpp')
| -rw-r--r-- | core/gpslocation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/gpslocation.cpp b/core/gpslocation.cpp index 485cbac56..3d27e28cc 100644 --- a/core/gpslocation.cpp +++ b/core/gpslocation.cpp @@ -211,8 +211,8 @@ static void copy_gps_location(struct gpsTracker &gps, struct dive *d) { struct dive_site *ds = get_dive_site_by_uuid(d->dive_site_uuid); if (!ds) { - d->dive_site_uuid = create_dive_site(qPrintable(gps.name), gps.when); - ds = get_dive_site_by_uuid(d->dive_site_uuid); + ds = create_dive_site(qPrintable(gps.name), gps.when); + d->dive_site_uuid = ds->uuid; } ds->location = gps.location; } |