From 7a443423bc633d8ea085879f9ad675cb134cc93c Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Wed, 6 May 2020 22:25:48 +0200 Subject: cleanup: generalize ExtraDataModel to display data of any dc The goal here is to remove a dependency on displayed_dive. While doing so, make the model more general and display any dc. Pass in the dc of the current dive instead of displayed dive, since all other tabs are already converted to show data of the current dive. The QStrings are cached since we generate them anyway, so we may just keep them. Thus, there is no danger of the dc becoming invalid. Signed-off-by: Berthold Stoeger --- qt-models/divecomputerextradatamodel.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'qt-models/divecomputerextradatamodel.h') diff --git a/qt-models/divecomputerextradatamodel.h b/qt-models/divecomputerextradatamodel.h index ab78e4541..9af4028eb 100644 --- a/qt-models/divecomputerextradatamodel.h +++ b/qt-models/divecomputerextradatamodel.h @@ -4,6 +4,8 @@ #include "cleanertablemodel.h" +struct divecomputer; + /* extra data model for additional dive computer data */ class ExtraDataModel : public CleanerTableModel { Q_OBJECT @@ -17,10 +19,14 @@ public: int rowCount(const QModelIndex &parent = QModelIndex()) const override; void clear(); - void updateDive(); + void updateDiveComputer(const struct divecomputer *dc); private: - int rows; + struct Item { + QString key; + QString value; + }; + std::vector items; }; #endif -- cgit v1.2.3-70-g09d2