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 dive computer extra data to C++

Browse source 
Use std::string and std::vector. Much simpler code.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-18 21:04:58 +02:00 • committed by bstoeger
parent b9a2eff3c9
commit bc761344d4
14 changed files with 101 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/save-xml.cpp
View file

@ -396,16 +396,15 @@ static void save_tags(struct membuffer *b, struct tag_entry *entry)
}
}
static void save_extra_data(struct membuffer *b, struct extra_data *ed)
static void save_extra_data(struct membuffer *b, const struct divecomputer *dc)
{
while (ed) {
if (ed->key && ed->value) {
for (const auto &ed: dc->extra_data) {
if (!ed.key.empty() && !ed.value.empty()) {
put_string(b, " <extradata");
show_utf8(b, ed->key, " key='", "'", 1);
show_utf8(b, ed->value, " value='", "'", 1);
show_utf8(b, ed.key.c_str(), " key='", "'", 1);
show_utf8(b, ed.value.c_str(), " value='", "'", 1);
put_string(b, " />\n");
}
ed = ed->next;
}
}
@ -471,7 +470,7 @@ static void save_dc(struct membuffer *b, struct dive *dive, struct divecomputer
save_airpressure(b, dc);
save_salinity(b, dc);
put_duration(b, dc->surfacetime, " <surfacetime>", " min</surfacetime>\n");
save_extra_data(b, dc->extra_data);
save_extra_data(b, dc);
save_events(b, dive, dc->events);
save_samples(b, dive, dc);