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

6
core/selection.cpp
View file

@ -156,7 +156,7 @@ QVector<dive *> setSelectionCore(const std::vector<dive *> &selection, dive *cur
static void clear_trip_selection()
{
amount_trips_selected = 0;
for (auto &trip: *divelog.trips)
for (auto &trip: divelog.trips)
trip->selected = false;
}
@ -202,7 +202,7 @@ void setTripSelection(dive_trip *trip, dive *currentDive)
current_dive = currentDive;
for (auto &d: divelog.dives)
d->selected = d->divetrip == trip;
for (auto &t: *divelog.trips)
for (auto &t: divelog.trips)
t->selected = t.get() == trip;
amount_selected = static_cast<int>(trip->dives.size());
@ -291,7 +291,7 @@ struct dive_trip *single_selected_trip()
{
if (amount_trips_selected != 1)
return NULL;
for (auto &trip: *divelog.trips) {
for (auto &trip: divelog.trips) {
if (trip->selected)
return trip.get();
}