mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change the signature of constructLocationTags

Browse source 
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 <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-10-02 23:09:09 -07:00
parent b96633d3e9
commit ed78aeade0
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/divesite.cpp
View file

@ -2,10 +2,9 @@
#include "divesite.h" #include "divesite.h"
#include "pref.h" #include "pref.h"
QString constructLocationTags(uint32_t ds_uuid) QString constructLocationTags(struct dive_site *ds)
{ {
QString locationTag; QString locationTag;
struct dive_site *ds = get_dive_site_by_uuid(ds_uuid);
if (!ds || !ds->taxonomy.nr) if (!ds || !ds->taxonomy.nr)
return locationTag; return locationTag;

2
core/divesite.h
View file

@ -76,7 +76,7 @@ void merge_dive_sites(uint32_t ref, uint32_t *uuids, int count);
#ifdef __cplusplus #ifdef __cplusplus
} }
QString constructLocationTags(uint32_t ds_uuid); QString constructLocationTags(struct dive_site *ds);
#endif #endif

2
desktop-widgets/locationinformation.cpp
View file

@ -114,7 +114,7 @@ void LocationInformationWidget::updateLabels()
ui.diveSiteCoordinates->clear(); ui.diveSiteCoordinates->clear();
} }
ui.locationTags->setText(constructLocationTags(displayed_dive_site.uuid)); ui.locationTags->setText(constructLocationTags(&displayed_dive_site));
emit startFilterDiveSite(displayed_dive_site.uuid); emit startFilterDiveSite(displayed_dive_site.uuid);
emit startEditDiveSite(displayed_dive_site.uuid); emit startEditDiveSite(displayed_dive_site.uuid);

2
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -458,7 +458,7 @@ void MainTab::updateDiveInfo(bool clear)
if (ds) { if (ds) {
ui.location->setCurrentDiveSiteUuid(ds->uuid); ui.location->setCurrentDiveSiteUuid(ds->uuid);
ui.locationTags->setText(constructLocationTags(ds->uuid)); ui.locationTags->setText(constructLocationTags(ds));
} else { } else {
ui.location->clear(); ui.location->clear();
clear_dive_site(&displayed_dive_site); clear_dive_site(&displayed_dive_site);