mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: replace dive_site::dives by an std::vector<>
Since this is now in C++, we don't have to use our crazy TABLE_* macros. This contains a logic change: the dives associated to a dive site are now unsorted. The old code was subtly buggy: dives were added in a sorted manner, but when the dive was edited the list was not resorted. Very unlikely that this leads to a serious problem, still not good. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
3f8b4604be
commit
801b5d50b2
12 changed files with 39 additions and 45 deletions
|
@ -120,13 +120,13 @@ const QVector<dive_site *> &MapLocationModel::selectedDs() const
|
|||
|
||||
static bool hasVisibleDive(const dive_site *ds)
|
||||
{
|
||||
return std::any_of(&ds->dives.dives[0], &ds->dives.dives[ds->dives.nr],
|
||||
return std::any_of(ds->dives.begin(), ds->dives.end(),
|
||||
[] (const dive *d) { return !d->hidden_by_filter; });
|
||||
}
|
||||
|
||||
static bool hasSelectedDive(const dive_site *ds)
|
||||
{
|
||||
return std::any_of(&ds->dives.dives[0], &ds->dives.dives[ds->dives.nr],
|
||||
return std::any_of(ds->dives.begin(), ds->dives.end(),
|
||||
[] (const dive *d) { return d->selected; });
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue