From 40a3e562b01de2827fa6c2c5fd9d46631f91dc36 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 25 Mar 2019 09:05:47 +0100 Subject: 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 --- desktop-widgets/tab-widgets/maintab.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'desktop-widgets/tab-widgets/maintab.cpp') 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(); -- cgit v1.2.3-70-g09d2