diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-03-25 09:05:47 +0100 |
|---|---|---|
| committer |  Robert C. Helling <helling@atdotde.de> | 2019-03-27 13:58:15 +0100 |
| commit | 40a3e562b01de2827fa6c2c5fd9d46631f91dc36 (patch) | |
| tree | 194fa05c48b087220cabd206125cc82eaf439d0d /core/subsurface-qt/DiveObjectHelper.cpp | |
| parent | 04593e8ec4bac2606dec54605c72a6a49cc83f9b (diff) | |
| download | subsurface-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 'core/subsurface-qt/DiveObjectHelper.cpp')
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index 921d55bea..e126298ac 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -114,10 +114,7 @@ QString DiveObjectHelper::gps() const struct dive_site *ds = m_dive->dive_site; if (!ds) return QString(); - char *gps = printGPSCoords(&ds->location); - QString res = gps; - free(gps); - return res; + return printGPSCoords(&ds->location); } QString DiveObjectHelper::gps_decimal() const |