From ed78aeade0b8b5554f082a8a010aef5f0c2a1916 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 2 Oct 2017 23:09:09 -0700 Subject: Change the signature of constructLocationTags We actually want to be able to pass a specific divesite structure and not have it look that up by uuid. Signed-off-by: Dirk Hohndel --- core/divesite.cpp | 3 +-- core/divesite.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'core') diff --git a/core/divesite.cpp b/core/divesite.cpp index 20e33dda1..293656c6a 100644 --- a/core/divesite.cpp +++ b/core/divesite.cpp @@ -2,10 +2,9 @@ #include "divesite.h" #include "pref.h" -QString constructLocationTags(uint32_t ds_uuid) +QString constructLocationTags(struct dive_site *ds) { QString locationTag; - struct dive_site *ds = get_dive_site_by_uuid(ds_uuid); if (!ds || !ds->taxonomy.nr) return locationTag; diff --git a/core/divesite.h b/core/divesite.h index b44e34a31..a731f0841 100644 --- a/core/divesite.h +++ b/core/divesite.h @@ -76,7 +76,7 @@ void merge_dive_sites(uint32_t ref, uint32_t *uuids, int count); #ifdef __cplusplus } -QString constructLocationTags(uint32_t ds_uuid); +QString constructLocationTags(struct dive_site *ds); #endif -- cgit v1.2.3-70-g09d2