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: include trip table directly in divelog

Browse source 
Having this as a pointer is an artifact from the C/C++ split.
The triptable header is small enough so that we can
include it directly

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-06-08 16:53:55 +02:00 • committed by bstoeger
parent 5af9d28291
commit 2bdcdab391
13 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/divelog.cpp
View file

@ -11,7 +11,6 @@
struct divelog divelog;
divelog::divelog() :
trips(std::make_unique<trip_table>()),
filter_presets(std::make_unique<filter_preset_table>()),
autogroup(false)
{
@ -34,10 +33,10 @@ void divelog::delete_single_dive(int idx)
// Deleting a dive may change the order of trips!
if (trip)
trips->sort();
trips.sort();
if (trip && trip->dives.empty())
trips->pull(trip);
trips.pull(trip);
unregister_dive_from_dive_site(dive);
dives.erase(dives.begin() + idx);
}
@ -51,7 +50,7 @@ void divelog::delete_multiple_dives(const std::vector<dive *> &dives_to_delete)
struct dive_trip *trip = unregister_dive_from_trip(d);
if (trip && trip->dives.empty()) {
trips_changed = true;
trips->pull(trip);
trips.pull(trip);
}
unregister_dive_from_dive_site(d);
@ -60,14 +59,14 @@ void divelog::delete_multiple_dives(const std::vector<dive *> &dives_to_delete)
// Deleting a dive may change the order of trips!
if (trips_changed)
trips->sort();
trips.sort();
}
void divelog::clear()
{
dives.clear();
sites.clear();
trips->clear();
trips.clear();
devices.clear();
filter_presets->clear();
}