diff options
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/command_divelist.cpp | 6 | ||||
| -rw-r--r-- | desktop-widgets/subsurfacewebservices.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop-widgets/command_divelist.cpp b/desktop-widgets/command_divelist.cpp index b5cbc12ee..5e3f30ce2 100644 --- a/desktop-widgets/command_divelist.cpp +++ b/desktop-widgets/command_divelist.cpp @@ -511,7 +511,7 @@ AddDive::AddDive(dive *d, bool autogroup, bool newNumber) allocTrip.reset(trip); } - int idx = dive_get_insertion_index(&dive_table, divePtr.get()); + int idx = dive_table_get_insertion_index(&dive_table, divePtr.get()); if (newNumber) divePtr->number = get_dive_nr_at_idx(idx); @@ -603,7 +603,7 @@ void ShiftTime::redoit() d->when += timeChanged; // Changing times may have unsorted the dive table - sort_table(&dive_table); + sort_dive_table(&dive_table); // We send one time changed signal per trip (see comments in DiveListNotifier.h). // Therefore, collect all dives in an array and sort by trip. @@ -615,7 +615,7 @@ void ShiftTime::redoit() // Send signals and sort tables. processByTrip(dives, [&](dive_trip *trip, const QVector<dive *> &divesInTrip) { if (trip) - sort_table(&trip->dives); // Keep the trip-table in order + sort_dive_table(&trip->dives); // Keep the trip-table in order emit diveListNotifier.divesTimeChanged(trip, timeChanged, divesInTrip); }); diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp index 643c0270f..2804d44d9 100644 --- a/desktop-widgets/subsurfacewebservices.cpp +++ b/desktop-widgets/subsurfacewebservices.cpp @@ -69,7 +69,7 @@ static bool merge_locations_into_dives(void) int i, j, tracer=0, changed=0; struct dive *gpsfix, *nextgpsfix, *dive; - sort_table(&gps_location_table); + sort_dive_table(&gps_location_table); for_each_dive (i, dive) { if (!dive_has_gps_location(dive)) { |