From 6ec82a3c80e0f362abc59a6df8ea793013f01c65 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 9 Dec 2019 15:37:26 +0100 Subject: Dive list: remove global pointer to DiveTrip model This part of the code had that horrible pattern, where reseting the model would invalidate all pointers to the DiveTrip model. Internalize these complexities in the MultiFilterSortModel. All accesses are now performed via that proxy model. Signed-off-by: Berthold Stoeger --- qt-models/divetripmodel.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'qt-models/divetripmodel.cpp') diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp index ae6dfe651..64bb28533 100644 --- a/qt-models/divetripmodel.cpp +++ b/qt-models/divetripmodel.cpp @@ -357,22 +357,6 @@ QVariant DiveTripModelBase::headerData(int section, Qt::Orientation orientation, return QVariant(); } -static std::unique_ptr currentModel; -DiveTripModelBase *DiveTripModelBase::instance() -{ - if (!currentModel) - resetModel(TREE); - return currentModel.get(); -} - -void DiveTripModelBase::resetModel(DiveTripModelBase::Layout layout) -{ - if (layout == TREE) - currentModel.reset(new DiveTripModelTree); - else - currentModel.reset(new DiveTripModelList); -} - // After resetting the model, the higher up model or view may call this // function to get informed on the current selection. // TODO: Currently, this reads and resets the selection. Make this more -- cgit v1.2.3-70-g09d2