summaryrefslogtreecommitdiffstats
path: root/qt-models/diveimportedmodel.h
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-09-22 20:23:37 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-10-02 08:04:49 -0700
commit8f3c85f58d0693a07df70a87b265cde0cdc860ac (patch)
tree95c9ae3885dc34a0d3c0cb07160b562d554d4b91 /qt-models/diveimportedmodel.h
parent10d4ba82a21e3648082ddd9bae5010881d71418a (diff)
downloadsubsurface-8f3c85f58d0693a07df70a87b265cde0cdc860ac.tar.gz
Import: get tables from DiveImportedModel not DownloadThread
When importing dives, consume the tables from DiveImportedModel and not the DownloadThread. This appears more logical and avoids an inconsistent state of the DiveImportedModel: On import the tables would be reset, but the DiveImportedModel wasn't informed of that. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'qt-models/diveimportedmodel.h')
-rw-r--r--qt-models/diveimportedmodel.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/qt-models/diveimportedmodel.h b/qt-models/diveimportedmodel.h
index 5f2575bce..db0f813b2 100644
--- a/qt-models/diveimportedmodel.h
+++ b/qt-models/diveimportedmodel.h
@@ -22,6 +22,7 @@ public:
Q_INVOKABLE void clearTable();
QHash<int, QByteArray> roleNames() const;
void deleteDeselected();
+ std::pair<struct dive_table, struct dive_site_table> consumeTables(); // Returns dives and sites and resets model.
Q_INVOKABLE void recordDives();
Q_INVOKABLE void startDownload();