mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: turn divecomputer list into std::vector<>
Since struct divecomputer is now fully C++ (i.e. cleans up after itself), we can simply turn the list of divecomputers into an std::vector<>. This makes the code quite a bit simpler, because the first divecomputer was actually a subobject. Yes, this makes the common case of a single divecomputer a little bit less efficient, but it really shouldn't matter. If it does, we can still write a special std::vector<>- like container that keeps the first element inline. This change makes pointers-to-divecomputers not stable. So always access the divecomputer via its index. As far as I can tell, most of the code already does this. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
e237f29fb2
commit
284582d2e8
54 changed files with 738 additions and 893 deletions
|
@ -534,11 +534,11 @@ QVariant TemplateLayout::getValue(QString list, QString property, const State &s
|
|||
} else if (property == "duration") {
|
||||
return formatDiveDuration(d);
|
||||
} else if (property == "noDive") {
|
||||
return d->duration.seconds == 0 && d->dc.duration.seconds == 0;
|
||||
return d->duration.seconds == 0 && d->dcs[0].duration.seconds == 0;
|
||||
} else if (property == "depth") {
|
||||
return get_depth_string(d->dc.maxdepth.mm, true, true);
|
||||
return get_depth_string(d->dcs[0].maxdepth.mm, true, true);
|
||||
} else if (property == "meandepth") {
|
||||
return get_depth_string(d->dc.meandepth.mm, true, true);
|
||||
return get_depth_string(d->dcs[0].meandepth.mm, true, true);
|
||||
} else if (property == "divemaster") {
|
||||
return d->diveguide;
|
||||
} else if (property == "diveguide") {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue