diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-08-15 00:03:15 +0200 |
|---|---|---|
| committer |  bstoeger <32835590+bstoeger@users.noreply.github.com> | 2019-09-14 13:20:59 +0200 |
| commit | 54720e6cff65ae860fb78431324b75203e71809a (patch) | |
| tree | 1986f2fc328ef3f48ccdb70bf54ef0a3454ea81d /core | |
| parent | 1b9581369af95bdf366f08c0d00d24c315d339bb (diff) | |
| download | subsurface-54720e6cff65ae860fb78431324b75203e71809a.tar.gz | |
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 <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 6 | ||||
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.h | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index d4bcfc4e0..e4945f007 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -315,12 +315,6 @@ QVector<CylinderObjectHelper> DiveObjectHelper::cylinderObjects() const return res; } -int DiveObjectHelper::tripNrDives() const -{ - struct dive_trip *dt = m_dive->divetrip; - return dt ? dt->dives.nr : 0; -} - int DiveObjectHelper::maxcns() const { return m_dive->maxcns; diff --git a/core/subsurface-qt/DiveObjectHelper.h b/core/subsurface-qt/DiveObjectHelper.h index f08759389..397bc4d36 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(int tripNrDives READ tripNrDives CONSTANT) Q_PROPERTY(int maxcns READ maxcns CONSTANT) Q_PROPERTY(int otu READ otu CONSTANT) Q_PROPERTY(QString sumWeight READ sumWeight CONSTANT) @@ -82,7 +81,6 @@ public: QStringList cylinders() const; QString cylinder(int idx) const; QVector<CylinderObjectHelper> cylinderObjects() const; - int tripNrDives() const; int maxcns() const; int otu() const; QString sumWeight() const; |