diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-08-13 07:28:24 +0200 |
|---|---|---|
| committer |  bstoeger <32835590+bstoeger@users.noreply.github.com> | 2019-09-14 13:20:59 +0200 |
| commit | be763452adc110cfcc011322d989698d897dd6ed (patch) | |
| tree | b4185f9d99a237621caa262a44340a9300396e7b /qt-models | |
| parent | a79c45e4010a18f8ffe0742ab844743eeeebab9e (diff) | |
| download | subsurface-be763452adc110cfcc011322d989698d897dd6ed.tar.gz | |
DiveObjectHelper: Turn DiveObjectHelper into Q_GADGET based object
DiveObjectHelper is a tiny wrapper around dive * to allow access
to dive data from QML and grantlee. It doesn't have to be a
full-fledged QObject with support for signals, etc. Therefore,
turn it into a Q_GADGET based object. This allows us passing the
object around as object, not as pointer to DiveObjectHelper.
This makes memory-management distinctly easier.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'qt-models')
| -rw-r--r-- | qt-models/divelistmodel.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/qt-models/divelistmodel.cpp b/qt-models/divelistmodel.cpp index 9c67ced8d..028bd3600 100644 --- a/qt-models/divelistmodel.cpp +++ b/qt-models/divelistmodel.cpp @@ -64,8 +64,8 @@ int DiveListSortModel::getIdxForId(int id) { for (int i = 0; i < rowCount(); i++) { QVariant v = data(index(i, 0), DiveListModel::DiveRole); - DiveObjectHelper *d = v.value<DiveObjectHelper *>(); - if (d->id() == id) + DiveObjectHelper d = v.value<DiveObjectHelper>(); + if (d.id() == id) return i; } return -1; @@ -239,13 +239,13 @@ QVariant DiveListModel::data(const QModelIndex &index, int role) const if(index.row() < 0 || index.row() >= m_dives.count()) return QVariant(); - DiveObjectHelper *curr_dive = m_dives[index.row()]; - const dive *d = curr_dive->getDive(); + DiveObjectHelper &curr_dive = *m_dives[index.row()]; + const dive *d = curr_dive.getDive(); if (!d) return QVariant(); switch(role) { - case DiveRole: return QVariant::fromValue<QObject*>(curr_dive); - case DiveDateRole: return (qlonglong)curr_dive->timestamp(); + case DiveRole: return QVariant::fromValue<DiveObjectHelper>(curr_dive); + case DiveDateRole: return (qlonglong)d->when; case TripIdRole: return d->divetrip ? QString::number((quint64)d->divetrip, 16) : QString(); case TripNrDivesRole: return d->divetrip ? d->divetrip->dives.nr : 0; case DateTimeRole: { @@ -305,7 +305,7 @@ DiveListModel *DiveListModel::instance() return m_instance; } -DiveObjectHelper* DiveListModel::at(int i) +DiveObjectHelper *DiveListModel::at(int i) { return m_dives.at(i); } |