summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/tab-widgets/maintab.cpp
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-03-25 09:05:47 +0100
committerGravatar Robert C. Helling <helling@atdotde.de>2019-03-27 13:58:15 +0100
commit40a3e562b01de2827fa6c2c5fd9d46631f91dc36 (patch)
tree194fa05c48b087220cabd206125cc82eaf439d0d /desktop-widgets/tab-widgets/maintab.cpp
parent04593e8ec4bac2606dec54605c72a6a49cc83f9b (diff)
downloadsubsurface-40a3e562b01de2827fa6c2c5fd9d46631f91dc36.tar.gz
Cleanup: provide printGPSCoords in C and C++ versions
printGPSCoords() returned a newly allocated C-style string. Most callers simply made a QString out of it and freed the C-style string. This is paradoxical, as printGPSCoords internally works with QStrings and converts them to C-style on return. Therefore, let printGPSCoords() return a QString and create a printGPSCoordsC() wrapper for the two C-callers. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/tab-widgets/maintab.cpp')
-rw-r--r--desktop-widgets/tab-widgets/maintab.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp
index a2ff15368..98b8904c2 100644
--- a/desktop-widgets/tab-widgets/maintab.cpp
+++ b/desktop-widgets/tab-widgets/maintab.cpp
@@ -410,11 +410,8 @@ void MainTab::updateDiveInfo(bool clear)
ui.location->setCurrentDiveSite(ds);
ui.locationTags->setText(constructLocationTags(&ds->taxonomy, true));
- if (ui.locationTags->text().isEmpty() && has_location(&ds->location)) {
- char *coords = printGPSCoords(&ds->location);
- ui.locationTags->setText(coords);
- free(coords);
- }
+ if (ui.locationTags->text().isEmpty() && has_location(&ds->location))
+ ui.locationTags->setText(printGPSCoords(&ds->location));
} else {
ui.location->clear();
ui.locationTags->clear();