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/modeldelegates.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'desktop-widgets/modeldelegates.cpp') diff --git a/desktop-widgets/modeldelegates.cpp b/desktop-widgets/modeldelegates.cpp index c6405a433..fd6bb2e47 100644 --- a/desktop-widgets/modeldelegates.cpp +++ b/desktop-widgets/modeldelegates.cpp @@ -483,11 +483,8 @@ void LocationFilterDelegate::paint(QPainter *painter, const QStyleOptionViewItem bottomText += QString(ds->taxonomy.category[idx].value); } - if (bottomText.isEmpty()) { - char *gpsCoords = printGPSCoords(&ds->location); - bottomText = QString(gpsCoords); - free(gpsCoords); - } + if (bottomText.isEmpty()) + bottomText = printGPSCoords(&ds->location); if (dive_site_has_gps_location(ds) && currentDiveSiteHasGPS) { // so we are showing a completion and both the current dive site and the completion -- cgit v1.2.3-70-g09d2