From 54720e6cff65ae860fb78431324b75203e71809a Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Thu, 15 Aug 2019 00:03:15 +0200 Subject: Mobile: move tripNrDive from DiveObjectHelper to DiveListModel We don't want to generate a DiveObjectHelper numerous times for every item in the dive list. Therefore, return this datum directly from the model. Signed-off-by: Berthold Stoeger --- qt-models/divelistmodel.cpp | 2 ++ qt-models/divelistmodel.h | 1 + 2 files changed, 3 insertions(+) (limited to 'qt-models') diff --git a/qt-models/divelistmodel.cpp b/qt-models/divelistmodel.cpp index caa31dcae..15934f9d6 100644 --- a/qt-models/divelistmodel.cpp +++ b/qt-models/divelistmodel.cpp @@ -245,6 +245,7 @@ QVariant DiveListModel::data(const QModelIndex &index, int role) const case DiveRole: return QVariant::fromValue(curr_dive); case DiveDateRole: return (qlonglong)curr_dive->timestamp(); case TripIdRole: return d->divetrip ? QString::number((quint64)d->divetrip, 16) : QString(); + case TripNrDivesRole: return d->divetrip ? d->divetrip->dives.nr : 0; } return QVariant(); @@ -256,6 +257,7 @@ QHash DiveListModel::roleNames() const roles[DiveRole] = "dive"; roles[DiveDateRole] = "date"; roles[TripIdRole] = "tripId"; + roles[TripNrDivesRole] = "tripNrDives"; return roles; } diff --git a/qt-models/divelistmodel.h b/qt-models/divelistmodel.h index 1cc3abb7d..e799ecf8a 100644 --- a/qt-models/divelistmodel.h +++ b/qt-models/divelistmodel.h @@ -39,6 +39,7 @@ public: DiveRole = Qt::UserRole + 1, DiveDateRole, TripIdRole, + TripNrDivesRole, }; static DiveListModel *instance(); -- cgit v1.2.3-70-g09d2