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

core: fold divesite-helper.cpp into divesite.cpp

Browse source 
The divesite-helper.cpp only existed because C-string manipulation
was too tedious. Now that divesite.cpp is C++ anyway, the split
is not necessary anymore.

Moreover, return an std::string, since this is a core-function.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-04 14:55:10 +02:00 • committed by bstoeger
parent 801b5d50b2
commit 177246b419
6 changed files with 55 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -178,7 +178,7 @@ void TabDiveNotes::updateDiveSite(struct dive *d)
struct dive_site *ds = d->dive_site;
ui.location->setCurrentDiveSite(d);
if (ds) {
ui.locationTags->setText(constructLocationTags(ds->taxonomy, true));
ui.locationTags->setText(QString::fromStdString(constructLocationTags(ds->taxonomy, true)));
if (ui.locationTags->text().isEmpty() && has_location(&ds->location))
ui.locationTags->setText(printGPSCoords(&ds->location));