diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-08-14 23:53:28 +0200 |
|---|---|---|
| committer |  bstoeger <32835590+bstoeger@users.noreply.github.com> | 2019-09-14 13:20:59 +0200 |
| commit | 1b9581369af95bdf366f08c0d00d24c315d339bb (patch) | |
| tree | a7c38c8993f14acc8eac4d8ba8a6f8d49e0975d8 /core/subsurface-qt | |
| parent | b7cddcc737886ee3e99cee30a78423570de15f00 (diff) | |
| download | subsurface-1b9581369af95bdf366f08c0d00d24c315d339bb.tar.gz | |
Mobile: move tripId from DiveObjectHelper to DiveListModel
The canonical way of displaying lists in Qt is via models.
Thus, return the tripId directly from the DiveListModel instead
of going indirectly via a DiveObjectHelper. In the future, this
will allow us to make the DiveObjectHelper value-based, as it
is not generated numerous times for every list item.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/subsurface-qt')
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 5 | ||||
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.h | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index d7d92ee90..d4bcfc4e0 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -315,11 +315,6 @@ QVector<CylinderObjectHelper> DiveObjectHelper::cylinderObjects() const return res; } -QString DiveObjectHelper::tripId() const -{ - return m_dive->divetrip ? QString::number((quint64)m_dive->divetrip, 16) : QString(); -} - int DiveObjectHelper::tripNrDives() const { struct dive_trip *dt = m_dive->divetrip; diff --git a/core/subsurface-qt/DiveObjectHelper.h b/core/subsurface-qt/DiveObjectHelper.h index 11416b6c6..f08759389 100644 --- a/core/subsurface-qt/DiveObjectHelper.h +++ b/core/subsurface-qt/DiveObjectHelper.h @@ -40,7 +40,6 @@ class DiveObjectHelper : public QObject { Q_PROPERTY(QStringList cylinderList READ cylinderList CONSTANT) Q_PROPERTY(QStringList cylinders READ cylinders CONSTANT) Q_PROPERTY(QVector<CylinderObjectHelper> cylinderObjects READ cylinderObjects CONSTANT) - Q_PROPERTY(QString tripId READ tripId CONSTANT) Q_PROPERTY(int tripNrDives READ tripNrDives CONSTANT) Q_PROPERTY(int maxcns READ maxcns CONSTANT) Q_PROPERTY(int otu READ otu CONSTANT) @@ -83,7 +82,6 @@ public: QStringList cylinders() const; QString cylinder(int idx) const; QVector<CylinderObjectHelper> cylinderObjects() const; - QString tripId() const; int tripNrDives() const; int maxcns() const; int otu() const; |