diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-11-22 09:00:50 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-11-23 13:22:24 -0800 |
| commit | a863386cd4c6260d14b1d7f5fbf7e3a21e580aaa (patch) | |
| tree | b2f25a99914dece354dec24c767a25f40f1d3335 | |
| parent | 9e565e355221d38c05d19002f040d6af7ce07735 (diff) | |
| download | subsurface-a863386cd4c6260d14b1d7f5fbf7e3a21e580aaa.tar.gz | |
Cleanup: remove DiveObjectHelper::trip() function
The DiveObjectHelper::trip() function was
1) Misnamed: it returned the *location* of the trip
2) Not used outside of DiveObjectHelper
Remove it.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 8 | ||||
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.h | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index 3a9216d63..e522e3e39 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -324,11 +324,6 @@ QList<CylinderObjectHelper*> DiveObjectHelper::cylinderObjects() const return m_cyls; } -QString DiveObjectHelper::trip() const -{ - return m_dive->divetrip ? m_dive->divetrip->location : EMPTY_DIVE_STRING; -} - // combine the pointer address with the trip title so that // we detect multiple, destinct trips with the same title // the trip title is designed to be @@ -448,5 +443,6 @@ QString DiveObjectHelper::fullText() const QString DiveObjectHelper::fullTextNoNotes() const { - return trip() + ":-:" + location() + ":-:" + buddy() + ":-:" + divemaster() + ":-:" + suit() + ":-:" + tags(); + QString tripLocation = m_dive->divetrip ? m_dive->divetrip->location : EMPTY_DIVE_STRING; + return tripLocation + ":-:" + location() + ":-:" + buddy() + ":-:" + divemaster() + ":-:" + suit() + ":-:" + tags(); } diff --git a/core/subsurface-qt/DiveObjectHelper.h b/core/subsurface-qt/DiveObjectHelper.h index c5f116e1a..f5f4e35f0 100644 --- a/core/subsurface-qt/DiveObjectHelper.h +++ b/core/subsurface-qt/DiveObjectHelper.h @@ -39,7 +39,6 @@ class DiveObjectHelper : public QObject { Q_PROPERTY(QStringList cylinderList READ cylinderList CONSTANT) Q_PROPERTY(QStringList cylinders READ cylinders CONSTANT) Q_PROPERTY(QList<CylinderObjectHelper*> cylinderObjects READ cylinderObjects CONSTANT) - Q_PROPERTY(QString trip READ trip CONSTANT) Q_PROPERTY(QString tripMeta READ tripMeta CONSTANT) Q_PROPERTY(int tripNrDives READ tripNrDives CONSTANT) Q_PROPERTY(int maxcns READ maxcns CONSTANT) @@ -86,7 +85,6 @@ public: QStringList cylinders() const; QString cylinder(int idx) const; QList<CylinderObjectHelper*> cylinderObjects() const; - QString trip() const; QString tripMeta() const; int tripNrDives() const; int maxcns() const; |