cleanup: replace get_trip_date_string() by get_trip_string()

The get_trip_date_string() formatted, as the name implies, the date
of a trip. It was passed a number of parameters and had only one
caller, which would also add the location if it existed.
Therefore, move all that logic into the helper function and
name it get_trip_string().

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 2 insertions, 1 deletions

diff --git a/core/qthelper.h b/core/qthelper.h
index b703a38b4..9ea51f312 100644
--- a/core/qthelper.h
+++ b/core/qthelper.h
@@ -8,6 +8,7 @@
 #include "subsurface-time.h"
 
 struct picture;
+struct dive_trip;
 
 // 1) Types
 
@@ -79,7 +80,7 @@ QString get_dive_date_string(timestamp_t when);
 QString get_first_dive_date_string();
 QString get_last_dive_date_string();
 QString get_short_dive_date_string(timestamp_t when);
-QString get_trip_date_string(timestamp_t when, int nr, bool getday);
+QString get_trip_string(const dive_trip *trip);
 QString getUiLanguage();
 void initUiLanguage();
 QLocale getLocale();