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: removed duration and depth variables

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:36:12 -02:00 • committed by Dirk Hohndel
parent ae222f147c
commit 0bb661c3e1
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_duration(get_dive_duration_string(d->duration.seconds, QObject::tr("h:"), QObject::tr("min"))),
m_depth(get_depth_string(d->dc.maxdepth.mm, true, true)),
m_divemaster(d->divemaster ? d->divemaster : EMPTY_DIVE_STRING), m_divemaster(d->divemaster ? d->divemaster : EMPTY_DIVE_STRING),
m_buddy(d->buddy ? d->buddy : EMPTY_DIVE_STRING), m_buddy(d->buddy ? d->buddy : EMPTY_DIVE_STRING),
m_airTemp(get_temperature_string(d->airtemp, true)), m_airTemp(get_temperature_string(d->airtemp, true)),
@ -158,12 +156,12 @@ QString DiveObjectHelper::gps() const
} }
QString DiveObjectHelper::duration() const QString DiveObjectHelper::duration() const
{ {
return m_duration; return get_dive_duration_string(m_dive->duration.seconds, QObject::tr("h:"), QObject::tr("min"));
} }
QString DiveObjectHelper::depth() const QString DiveObjectHelper::depth() const
{ {
return m_depth; return get_depth_string(m_dive->dc.maxdepth.mm, true, true);
} }
QString DiveObjectHelper::divemaster() const QString DiveObjectHelper::divemaster() const

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

@ -65,8 +65,6 @@ private:
QString m_date; QString m_date;
QString m_time; QString m_time;
QString m_gps; QString m_gps;
QString m_duration;
QString m_depth;
QString m_divemaster; QString m_divemaster;
QString m_buddy; QString m_buddy;
QString m_airTemp; QString m_airTemp;