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

Cleanup: remove DiveObjectHelper::trip() function

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2018-11-22 09:00:50 +01:00 • committed by Dirk Hohndel
parent 9e565e3552
commit a863386cd4
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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();
}