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

core: turn trip-table into our own sorted_owning_table

Browse source 
Since the sorted_owning_table depends on the fact that
different elements never compare as equal, make the
comparison function safer in that respect. If all failes,
compare the pointers.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-06-01 22:05:57 +02:00 • committed by bstoeger
parent 1cebafb08f
commit eacad89531
21 changed files with 217 additions and 305 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/string-format.cpp
View file

@ -299,26 +299,23 @@ QString formatMinutes(int seconds)
return QString::asprintf("%d:%.2d", FRACTION_TUPLE(seconds, 60));
}
QString formatTripTitle(const dive_trip *trip)
QString formatTripTitle(const dive_trip &trip)
{
if (!trip)
return QString();
timestamp_t when = trip_date(trip);
bool getday = trip_is_single_day(trip);
QDateTime localTime = timestampToDateTime(when);
QString prefix = !trip->location.empty() ? QString::fromStdString(trip->location) + ", " : QString();
QString prefix = !trip.location.empty() ? QString::fromStdString(trip.location) + ", " : QString();
if (getday)
return prefix + loc.toString(localTime, prefs.date_format);
else
return prefix + loc.toString(localTime, "MMM yyyy");
}
QString formatTripTitleWithDives(const dive_trip *trip)
QString formatTripTitleWithDives(const dive_trip &trip)
{
int nr = trip->dives.nr;
int nr = trip.dives.nr;
return formatTripTitle(trip) + " " +
gettextFromC::tr("(%n dive(s))", "", nr);
}