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 --- map-widget/qmlmapwidgethelper.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'map-widget/qmlmapwidgethelper.cpp') diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp index 61b8f0abe..b13c047e7 100644 --- a/map-widget/qmlmapwidgethelper.cpp +++ b/map-widget/qmlmapwidgethelper.cpp @@ -246,10 +246,8 @@ void MapWidgetHelper::copyToClipboardCoordinates(QGeoCoordinate coord, bool form bool savep = prefs.coordinates_traditional; prefs.coordinates_traditional = formatTraditional; location_t location = mk_location(coord); - char *coordinates = printGPSCoords(&location); - QApplication::clipboard()->setText(QString(coordinates), QClipboard::Clipboard); + QApplication::clipboard()->setText(printGPSCoords(&location), QClipboard::Clipboard); - free(coordinates); prefs.coordinates_traditional = savep; } -- cgit v1.2.3-70-g09d2