From f6e7bdc5ef99d5a5fe71ac4f32511900fa82e804 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 26 Feb 2019 22:26:11 +0100 Subject: Dive site: add dive site table parameter to dive site functions To enable undo of dive site functions, it is crucial to work with different dive site tables. Therefore add a dive site table parameter to dive site functions. For now, always pass the global dive site table. Thus, this commit shouldn't alter any functionality. After this change, a simple search for dive_site_table reveals all places where the global dive site table is accessed. Signed-off-by: Berthold Stoeger --- qt-models/divelocationmodel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qt-models') diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp index a942961a5..552c7c276 100644 --- a/qt-models/divelocationmodel.cpp +++ b/qt-models/divelocationmodel.cpp @@ -70,7 +70,7 @@ QVariant LocationInformationModel::data(const QModelIndex &index, int role) cons if (!index.isValid()) return QVariant(); - struct dive_site *ds = get_dive_site(index.row()); + struct dive_site *ds = get_dive_site(index.row(), &dive_site_table); return getDiveSiteData(ds, index.column(), role); } @@ -95,9 +95,9 @@ bool LocationInformationModel::removeRows(int row, int, const QModelIndex&) return false; beginRemoveRows(QModelIndex(), row, row); - struct dive_site *ds = get_dive_site(row); + struct dive_site *ds = get_dive_site(row, &dive_site_table); if (ds) - delete_dive_site(ds); + delete_dive_site(ds, &dive_site_table); endRemoveRows(); return true; } -- cgit v1.2.3-70-g09d2