mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: fix incorrect QString::asprintf/vasprintf usage

Browse source 
These are static functions, they cannot be used as a method on an object to
construct that object.

commit aa5f2e7c73 ("cleanup: replace deprecated sprintf()/vsprintf() calls")
introduced this bug in an ill-advised attempt to deal with a deprecation
warning.

This caused us to not print GPS coordinates in the UI.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-11-17 08:24:07 -08:00
parent 71389cfa92
commit d6d3c9a02f
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,3 +1,4 @@
- core: fix missing GPS coordinate strings in the UI
- core: Gracefully handle infinte MND for oxygen - core: Gracefully handle infinte MND for oxygen
- mobile: add location service warning as required by Google Play - mobile: add location service warning as required by Google Play
- mobile: fix manually adding dives in the past [#2971] - mobile: fix manually adding dives in the past [#2971]

2
core/downloadfromdcthread.cpp
View file

@ -18,7 +18,7 @@ static QString str_error(const char *fmt, ...)
{ {
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
const QString str = QString().vasprintf(fmt, args); const QString str = QString::vasprintf(fmt, args);
va_end(args); va_end(args);
return str; return str;

4
core/qthelper.cpp
View file

@ -107,11 +107,11 @@ QString printGPSCoords(const location_t *location)
lonmin = (lon % 1000000U) * 60U; lonmin = (lon % 1000000U) * 60U;
latsec = (latmin % 1000000) * 60; latsec = (latmin % 1000000) * 60;
lonsec = (lonmin % 1000000) * 60; lonsec = (lonmin % 1000000) * 60;
result.asprintf("%u°%02d\'%06.3f\"%s %u°%02d\'%06.3f\"%s", result = QString::asprintf("%u°%02d\'%06.3f\"%s %u°%02d\'%06.3f\"%s",
latdeg, latmin / 1000000, latsec / 1000000, qPrintable(lath), latdeg, latmin / 1000000, latsec / 1000000, qPrintable(lath),
londeg, lonmin / 1000000, lonsec / 1000000, qPrintable(lonh)); londeg, lonmin / 1000000, lonsec / 1000000, qPrintable(lonh));
} else { } else {
result.asprintf("%f %f", (double) lat / 1000000.0, (double) lon / 1000000.0); result = QString::asprintf("%f %f", (double) lat / 1000000.0, (double) lon / 1000000.0);
} }
return result; return result;
} }