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

Cleanup: remove shown flag of DiveTripModelTree items

Browse source 
Since we now filter at the model level, items are by definition
shown. No need for a flag.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-02-10 21:00:26 +01:00 • committed by Dirk Hohndel
parent 03a6440b2a
commit be3d7bffc6
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qt-models/divetripmodel.cpp
View file

@ -702,19 +702,15 @@ QModelIndex DiveTripModelTree::parent(const QModelIndex &index) const
}
DiveTripModelTree::Item::Item(dive_trip *t, const QVector<dive *> &divesIn) : d_or_t{nullptr, t},
dives(std::vector<dive *>(divesIn.begin(), divesIn.end())),
shown(std::any_of(dives.begin(), dives.end(), [](dive *d){ return !d->hidden_by_filter; }))
dives(std::vector<dive *>(divesIn.begin(), divesIn.end()))
{
}
DiveTripModelTree::Item::Item(dive_trip *t, dive *d) : d_or_t{nullptr, t},
dives({ d }),
shown(!d->hidden_by_filter)
DiveTripModelTree::Item::Item(dive_trip *t, dive *d) : d_or_t{nullptr, t}, dives({ d })
{
}
DiveTripModelTree::Item::Item(dive *d) : d_or_t{d, nullptr},
shown(!d->hidden_by_filter)
DiveTripModelTree::Item::Item(dive *d) : d_or_t{d, nullptr}
{
}

1
qt-models/divetripmodel.h
View file

@ -137,7 +137,6 @@ private:
struct Item {
dive_or_trip d_or_t;
std::vector<dive *> dives; // std::vector<> instead of QVector for insert() with three iterators
bool shown;
Item(dive_trip *t, const QVector<dive *> &dives);
Item(dive_trip *t, dive *d); // Initialize a trip with one dive
Item(dive *d); // Initialize a top-level dive