mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify: remove suit and trip

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2016-01-11 15:49:06 -02:00 • committed by Dirk Hohndel
parent 8929d6eb1a
commit 75561ff956
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsurface-core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -34,8 +34,6 @@ static QString getFormattedCylinder(struct dive *dive, unsigned int idx)
} }
DiveObjectHelper::DiveObjectHelper(struct dive *d) : 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_maxcns(d->maxcns),
m_otu(d->otu), m_otu(d->otu),
m_dive(d) m_dive(d)
@ -215,7 +213,7 @@ QString DiveObjectHelper::weight(int idx) const
QString DiveObjectHelper::suit() const QString DiveObjectHelper::suit() const
{ {
return m_suit; return m_dive->suit ? m_dive->suit : EMPTY_DIVE_STRING;
} }
QStringList DiveObjectHelper::cylinders() const QStringList DiveObjectHelper::cylinders() const
@ -232,7 +230,7 @@ QString DiveObjectHelper::cylinder(int idx) const
QString DiveObjectHelper::trip() const QString DiveObjectHelper::trip() const
{ {
return m_trip; return m_dive->divetrip ? m_dive->divetrip->location : EMPTY_DIVE_STRING;
} }
QString DiveObjectHelper::maxcns() const QString DiveObjectHelper::maxcns() const

2
subsurface-core/subsurface-qt/DiveObjectHelper.h
View file

@ -70,9 +70,7 @@ private:
QString m_gas; QString m_gas;
QString m_sac; QString m_sac;
QStringList m_weights; QStringList m_weights;
QString m_suit;
QStringList m_cylinders; QStringList m_cylinders;
QString m_trip;
QString m_maxcns; QString m_maxcns;
QString m_otu; QString m_otu;
struct dive *m_dive; struct dive *m_dive;