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

core: port printGPSCoordsC to return std::string

Browse source 
Less memory management hassle.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-02-29 13:53:17 +01:00 • committed by Michael Keller
parent 119fe908c7
commit 2f3d8d83f5
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/load-git.cpp
View file

@ -181,10 +181,9 @@ static void parse_dive_gps(char *line, struct membuffer *, struct git_parser_sta
add_dive_to_dive_site(state->active_dive, ds); add_dive_to_dive_site(state->active_dive, ds);
} else { } else {
if (dive_site_has_gps_location(ds) && !same_location(&ds->location, &location)) { if (dive_site_has_gps_location(ds) && !same_location(&ds->location, &location)) {
char *coords = printGPSCoordsC(&location); std::string coords = printGPSCoordsC(&location);
// we have a dive site that already has GPS coordinates // we have a dive site that already has GPS coordinates
ds->notes = add_to_string(ds->notes, translate("gettextFromC", "multiple GPS locations for this dive site; also %s\n"), coords); ds->notes = add_to_string(ds->notes, translate("gettextFromC", "multiple GPS locations for this dive site; also %s\n"), coords.c_str());
free(coords);
} }
ds->location = location; ds->location = location;
} }

5
core/parse-xml.cpp
View file

@ -1230,9 +1230,8 @@ static void gps_in_dive(const char *buffer, struct dive *dive, struct parser_sta
fprintf(stderr, "dive site uuid in dive, but gps location (%10.6f/%10.6f) different from dive location (%10.6f/%10.6f)\n", fprintf(stderr, "dive site uuid in dive, but gps location (%10.6f/%10.6f) different from dive location (%10.6f/%10.6f)\n",
ds->location.lat.udeg / 1000000.0, ds->location.lon.udeg / 1000000.0, ds->location.lat.udeg / 1000000.0, ds->location.lon.udeg / 1000000.0,
location.lat.udeg / 1000000.0, location.lon.udeg / 1000000.0); location.lat.udeg / 1000000.0, location.lon.udeg / 1000000.0);
char *coords = printGPSCoordsC(&location); std::string coords = printGPSCoordsC(&location);
ds->notes = add_to_string(ds->notes, translate("gettextFromC", "multiple GPS locations for this dive site; also %s\n"), coords); ds->notes = add_to_string(ds->notes, translate("gettextFromC", "multiple GPS locations for this dive site; also %s\n"), coords.c_str());
free(coords);
} else { } else {
ds->location = location; ds->location = location;
} }

4
core/qthelper.cpp
View file

@ -115,9 +115,9 @@ QString printGPSCoords(const location_t *location)
return result; return result;
} }
extern "C" char *printGPSCoordsC(const location_t *location) std::string printGPSCoordsC(const location_t *location)
{ {
return copy_qstring(printGPSCoords(location)); return printGPSCoords(location).toStdString();
} }
/** /**

2
core/qthelper.h
View file

@ -93,6 +93,7 @@ QLocale getLocale();
QVector<QPair<QString, int>> selectedDivesGasUsed(); QVector<QPair<QString, int>> selectedDivesGasUsed();
QString getUserAgent(); QString getUserAgent();
QString printGPSCoords(const location_t *loc); QString printGPSCoords(const location_t *loc);
std::string printGPSCoordsC(const location_t *loc);
std::vector<int> get_cylinder_map_for_remove(int count, int n); std::vector<int> get_cylinder_map_for_remove(int count, int n);
std::vector<int> get_cylinder_map_for_add(int count, int n); std::vector<int> get_cylinder_map_for_add(int count, int n);
@ -118,7 +119,6 @@ extern "C" {
struct git_info; struct git_info;
char *printGPSCoordsC(const location_t *loc);
bool getProxyString(char **buffer); bool getProxyString(char **buffer);
bool canReachCloudServer(struct git_info *); bool canReachCloudServer(struct git_info *);
void updateWindowTitle(); void updateWindowTitle();