diff options
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); } |