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>

1 files changed, 4 insertions, 9 deletions

diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp
index f4da411af..af3fa513f 100644
--- a/desktop-widgets/locationinformation.cpp
+++ b/desktop-widgets/locationinformation.cpp
@@ -113,13 +113,10 @@ void LocationInformationWidget::updateLabels()
 		ui.diveSiteNotes->setPlainText(diveSite->notes);
 	else
 		ui.diveSiteNotes->clear();
-	if (has_location(&diveSite->location)) {
-		char *coords = printGPSCoords(&diveSite->location);
-		ui.diveSiteCoordinates->setText(coords);
-		free(coords);
-	} else {
+	if (has_location(&diveSite->location))
+		ui.diveSiteCoordinates->setText(printGPSCoords(&diveSite->location));
+	else
 		ui.diveSiteCoordinates->clear();
-	}
 
 	ui.locationTags->setText(constructLocationTags(&taxonomy, false));
 }
@@ -138,10 +135,8 @@ void LocationInformationWidget::updateGpsCoordinates(const location_t &location)
 {
 	QString oldText = ui.diveSiteCoordinates->text();
 
-	char *coords = printGPSCoords(&location);
-	ui.diveSiteCoordinates->setText(coords);
+	ui.diveSiteCoordinates->setText(printGPSCoords(&location));
 	enableLocationButtons(has_location(&location));
-	free(coords);
 	if (oldText != ui.diveSiteCoordinates->text())
 		markChangedWidget(ui.diveSiteCoordinates);
 }