From 6f95242ff121f0d5e6cace4c7c07aa8536c78fdc Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 11 Jan 2016 15:56:50 -0200 Subject: Simplify: remove Maxcns and OTU variables Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- subsurface-core/subsurface-qt/DiveObjectHelper.cpp | 6 ++---- subsurface-core/subsurface-qt/DiveObjectHelper.h | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'subsurface-core/subsurface-qt') diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp b/subsurface-core/subsurface-qt/DiveObjectHelper.cpp index 181f89b1d..cd9d018b6 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_maxcns(d->maxcns), - m_otu(d->otu), m_dive(d) { struct dive_site *ds = get_dive_site_by_uuid(d->dive_site_uuid); @@ -235,12 +233,12 @@ QString DiveObjectHelper::trip() const QString DiveObjectHelper::maxcns() const { - return m_maxcns; + return QString(m_dive->maxcns); } QString DiveObjectHelper::otu() const { - return m_otu; + return QString(m_dive->otu); } int DiveObjectHelper::rating() const diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.h b/subsurface-core/subsurface-qt/DiveObjectHelper.h index b96eb6187..c3c8defda 100644 --- a/subsurface-core/subsurface-qt/DiveObjectHelper.h +++ b/subsurface-core/subsurface-qt/DiveObjectHelper.h @@ -71,8 +71,6 @@ private: QString m_sac; QStringList m_weights; QStringList m_cylinders; - QString m_maxcns; - QString m_otu; struct dive *m_dive; }; Q_DECLARE_METATYPE(DiveObjectHelper *) -- cgit v1.2.3-70-g09d2