diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2016-01-11 15:49:06 -0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-01-11 15:46:20 -0800 |
| commit | 75561ff9566a971d24ff596032a77219c468e906 (patch) | |
| tree | 3439364ff3483330cfbf7bb6f3e6c1a3c5e70680 /subsurface-core | |
| parent | 8929d6eb1a5d6ace2c6f4b6de71eb85a04e16a82 (diff) | |
| download | subsurface-75561ff9566a971d24ff596032a77219c468e906.tar.gz | |
Simplify: remove suit and trip
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-core')
| -rw-r--r-- | subsurface-core/subsurface-qt/DiveObjectHelper.cpp | 6 | ||||
| -rw-r--r-- | subsurface-core/subsurface-qt/DiveObjectHelper.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp b/subsurface-core/subsurface-qt/DiveObjectHelper.cpp index b1501b380..181f89b1d 100644 --- a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp +++ b/subsurface-core/subsurface-qt/DiveObjectHelper.cpp @@ -34,8 +34,6 @@ static QString getFormattedCylinder(struct dive *dive, unsigned int idx) } DiveObjectHelper::DiveObjectHelper(struct dive *d) : - m_suit(d->suit ? d->suit : EMPTY_DIVE_STRING), - m_trip(d->divetrip ? d->divetrip->location : EMPTY_DIVE_STRING), m_maxcns(d->maxcns), m_otu(d->otu), m_dive(d) @@ -215,7 +213,7 @@ QString DiveObjectHelper::weight(int idx) const QString DiveObjectHelper::suit() const { - return m_suit; + return m_dive->suit ? m_dive->suit : EMPTY_DIVE_STRING; } QStringList DiveObjectHelper::cylinders() const @@ -232,7 +230,7 @@ QString DiveObjectHelper::cylinder(int idx) const QString DiveObjectHelper::trip() const { - return m_trip; + return m_dive->divetrip ? m_dive->divetrip->location : EMPTY_DIVE_STRING; } QString DiveObjectHelper::maxcns() const diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.h b/subsurface-core/subsurface-qt/DiveObjectHelper.h index a47bff599..b96eb6187 100644 --- a/subsurface-core/subsurface-qt/DiveObjectHelper.h +++ b/subsurface-core/subsurface-qt/DiveObjectHelper.h @@ -70,9 +70,7 @@ private: QString m_gas; QString m_sac; QStringList m_weights; - QString m_suit; QStringList m_cylinders; - QString m_trip; QString m_maxcns; QString m_otu; struct dive *m_dive; |