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: introduce DiveTripModelBase::IS_TRIP_ROLE

Browse source 
To test whether an entry is a trip, we passed a pointer to the
trip through a QVariant and tested that for null-ity.

Passing pointers through QVariants has given us myriads of
problems in QML, therefore introduce a bool IS_TRIP_ROLE

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-11-11 21:36:51 +01:00 • committed by bstoeger
parent a474264cc8
commit e434b5aa40
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qt-models/divetripmodel.cpp
View file

@ -723,6 +723,8 @@ QVariant DiveTripModelTree::data(const QModelIndex &index, int role) const
return defaultModelFont();
dive_or_trip entry = tripOrDive(index);
if (role == IS_TRIP_ROLE)
return !!entry.trip;
if (entry.trip)
return tripData(entry.trip, index.column(), role);
else if (entry.dive)