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 divemaster

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:39:04 -02:00 • committed by Dirk Hohndel
parent 0bb661c3e1
commit a6796d9c80
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,6 @@ static QString getFormattedCylinder(struct dive *dive, unsigned int idx)
}
DiveObjectHelper::DiveObjectHelper(struct dive *d) :
m_divemaster(d->divemaster ? d->divemaster : EMPTY_DIVE_STRING),
m_buddy(d->buddy ? d->buddy : EMPTY_DIVE_STRING),
m_airTemp(get_temperature_string(d->airtemp, true)),
m_waterTemp(get_temperature_string(d->watertemp, true)),
@ -166,7 +165,7 @@ QString DiveObjectHelper::depth() const
QString DiveObjectHelper::divemaster() const
{
return m_divemaster;
return m_dive->divemaster ? m_dive->divemaster : EMPTY_DIVE_STRING;
}
QString DiveObjectHelper::buddy() const

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

@ -65,7 +65,6 @@ private:
QString m_date;
QString m_time;
QString m_gps;
QString m_divemaster;
QString m_buddy;
QString m_airTemp;
QString m_waterTemp;