From 27944a52b1c2a1c68ccfe88c4a84d3f74fb8b512 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 23 Jun 2019 09:22:26 +0200 Subject: Undo: don't send signals batched by trip Since the default view is batched by trips, signals were sent trip-wise. This seemed like a good idea at first, but when more and more parts used these signals, it became a burden. Therefore push the batching to the part of the code where it is needed: the trip view. The divesAdded and divesDeleted are not yet converted, because these are combined with trip addition/deletion. This should also be detangled, but not now. Since the dive-lists were sorted in the processByTrip function, the dive-list model now does its own sorting. This will have to be audited. Signed-off-by: Berthold Stoeger --- qt-models/cylindermodel.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qt-models/cylindermodel.cpp') diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp index 0e5388818..4f16231b3 100644 --- a/qt-models/cylindermodel.cpp +++ b/qt-models/cylindermodel.cpp @@ -7,7 +7,6 @@ #include "qt-models/diveplannermodel.h" #include "core/gettextfromc.h" #include "core/subsurface-qt/DiveListNotifier.h" -#include "core/trip.h" // TODO: Needed because cylindersReset uses a trip parameter -> remove that! CylindersModel::CylindersModel(QObject *parent) : CleanerTableModel(parent), @@ -619,7 +618,7 @@ bool CylindersModel::updateBestMixes() return gasUpdated; } -void CylindersModel::cylindersReset(dive_trip *trip, const QVector &dives) +void CylindersModel::cylindersReset(const QVector &dives) { // This model only concerns the currently displayed dive. If this is not among the // dives that had their cylinders reset, exit. -- cgit v1.2.3-70-g09d2