Dive list: clear internal data when clearing model

The DiveListModelBase::clear() implementation was flawed: It cleared
the data in the core, but left the data in the model untouched.
The code was relying on the fact that the caller would reset the
model manually. Not a good idea.

Therefore, clear the internal data to keep the model consistent at
all times.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 3 insertions, 0 deletions

diff --git a/qt-models/divetripmodel.h b/qt-models/divetripmodel.h
index 94278229d..c7e488030 100644
--- a/qt-models/divetripmodel.h
+++ b/qt-models/divetripmodel.h
@@ -100,6 +100,7 @@ protected:
 	static QVariant tripData(const dive_trip *trip, int column, int role);
 
 	virtual dive *diveOrNull(const QModelIndex &index) const = 0;	// Returns a dive if this index represents a dive, null otherwise
+	virtual void clearData() = 0;
 };
 
 class DiveTripModelTree : public DiveTripModelBase
@@ -119,6 +120,7 @@ public:
 	DiveTripModelTree(QObject *parent = nullptr);
 private:
 	int rowCount(const QModelIndex &parent) const override;
+	void clearData() override;
 	QModelIndex index(int row, int column, const QModelIndex &parent) const override;
 	QModelIndex parent(const QModelIndex &index) const override;
 	QVariant data(const QModelIndex &index, int role) const override;
@@ -184,6 +186,7 @@ public:
 	DiveTripModelList(QObject *parent = nullptr);
 private:
 	int rowCount(const QModelIndex &parent) const override;
+	void clearData() override;
 	QModelIndex index(int row, int column, const QModelIndex &parent) const override;
 	QModelIndex parent(const QModelIndex &index) const override;
 	QVariant data(const QModelIndex &index, int role) const override;