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: move functions into trip-structure

Browse source 
Not strictly necessary, but a "natural" thing to do in a classical
C++ code base.

Move the tiny trip-table into its own source file, since it also
has its own header.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-06-08 15:28:16 +02:00 • committed by bstoeger
parent 67d0f69516
commit 7792f54a73
16 changed files with 78 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/divelist.cpp
View file

@ -642,9 +642,9 @@ int comp_dives(const struct dive &a, const struct dive &b)
return -1;
if (!a.divetrip)
return 1;
if (trip_date(*a.divetrip) < trip_date(*b.divetrip))
if (a.divetrip->date() < b.divetrip->date())
return -1;
if (trip_date(*a.divetrip) > trip_date(*b.divetrip))
if (a.divetrip->date() > b.divetrip->date())
return 1;
}
if (a.number < b.number)
@ -676,7 +676,7 @@ static void autogroup_dives(struct dive_table &table, struct trip_table &trip_ta
for (auto &entry: get_dives_to_autogroup(table)) {
for (auto it = table.begin() + entry.from; it != table.begin() + entry.to; ++it)
add_dive_to_trip(it->get(), entry.trip);
entry.trip->add_dive(it->get());
/* If this was newly allocated, add trip to list */
if (entry.created_trip)
trip_table.put(std::move(entry.created_trip));
@ -911,7 +911,7 @@ void add_imported_dives(struct divelog &import_log, int flags)
struct dive_site *site = d->dive_site;
d->divetrip = NULL;
d->dive_site = NULL;
add_dive_to_trip(d.get(), trip);
trip->add_dive(d.get());
if (site)
site->add_dive(d.get());
}