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

16
core/selection.cpp
View file

@ -173,8 +173,8 @@ QVector<dive *> setSelectionCore(const std::vector<dive *> &selection, dive *cur
static void clear_trip_selection()
{
amount_trips_selected = 0;
for (int i = 0; i < divelog.trips->nr; ++i)
divelog.trips->trips[i]->selected = false;
for (auto &trip: *divelog.trips)
trip->selected = false;
}
// Reset the selection to the dives of the "selection" vector and send the appropriate signals.
@ -221,10 +221,8 @@ void setTripSelection(dive_trip *trip, dive *currentDive)
dive &d = *divelog.dives->dives[i];
d.selected = d.divetrip == trip;
}
for (int i = 0; i < divelog.trips->nr; ++i) {
dive_trip *t = divelog.trips->trips[i];
t->selected = t == trip;
}
for (auto &t: *divelog.trips)
t->selected = t.get() == trip;
amount_selected = trip->dives.nr;
amount_trips_selected = 1;
@ -315,9 +313,9 @@ struct dive_trip *single_selected_trip()
{
if (amount_trips_selected != 1)
return NULL;
for (int i = 0; i < divelog.trips->nr; ++i) {
if (divelog.trips->trips[i]->selected)
return divelog.trips->trips[i];
for (auto &trip: *divelog.trips) {
if (trip->selected)
return trip.get();
}
report_info("warning: found no selected trip even though one should be selected");
return NULL; // shouldn't happen