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: convert divesite strings to std::string

Browse source 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-04 17:18:08 +02:00 • committed by bstoeger
parent 3916125786
commit 7d3977481a
38 changed files with 181 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

11
smtk-import/smartrak.cpp
View file

@ -347,7 +347,7 @@ static void smtk_wreck_site(MdbHandle *mdb, char *site_idx, struct dive_site *ds
break;
}
}
concat(&ds->notes, "\n", notes);
concat(ds->notes, "\n", notes);
break;
}
}
@ -423,18 +423,17 @@ static void smtk_build_location(MdbHandle *mdb, char *idx, struct dive_site **lo
concat(str, ", ", table.get_string_view(1)); // Locality
concat(str, ", ", site);
ds = get_dive_site_by_name(str.c_str(), log->sites);
ds = get_dive_site_by_name(str, log->sites);
if (!ds) {
if (!has_location(&loc))
ds = create_dive_site(str.c_str(), log->sites);
ds = create_dive_site(str, log->sites);
else
ds = create_dive_site_with_gps(str.c_str(), &loc, log->sites);
ds = create_dive_site_with_gps(str, &loc, log->sites);
}
*location = ds;
/* Insert site notes */
free(ds->notes);
ds->notes = strdup(notes.c_str());
ds->notes = notes.c_str();
/* Check if we have a wreck */
smtk_wreck_site(mdb, idx, ds);