diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2016-01-11 15:39:04 -0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-01-11 15:46:11 -0800 |
| commit | a6796d9c80f7f643ce729261eabac5f5fab78936 (patch) | |
| tree | 8e6aac85fb9a018d3e142e2999a7d9fe50c7b185 | |
| parent | 0bb661c3e1dd0a30e6815f758c7e49e40604f899 (diff) | |
| download | subsurface-a6796d9c80f7f643ce729261eabac5f5fab78936.tar.gz | |
Simplify: removed divemaster
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | subsurface-core/subsurface-qt/DiveObjectHelper.cpp | 3 | ||||
| -rw-r--r-- | subsurface-core/subsurface-qt/DiveObjectHelper.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp b/subsurface-core/subsurface-qt/DiveObjectHelper.cpp index 5e441d892..c60dc4a67 100644 --- a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp +++ b/subsurface-core/subsurface-qt/DiveObjectHelper.cpp @@ -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 diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.h b/subsurface-core/subsurface-qt/DiveObjectHelper.h index 4a78fd779..4240b035b 100644 --- a/subsurface-core/subsurface-qt/DiveObjectHelper.h +++ b/subsurface-core/subsurface-qt/DiveObjectHelper.h @@ -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; |