diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-09-25 20:49:13 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-10-02 08:04:49 -0700 |
| commit | ad7ffa0af03718829c62621aceaaac959932ac14 (patch) | |
| tree | 2795ea847f2f1b0d35866faf3b999f3cd6c78db4 /desktop-widgets/downloadfromdivecomputer.h | |
| parent | 6e343c734af619e620962f2ab26862c5c416300a (diff) | |
| download | subsurface-ad7ffa0af03718829c62621aceaaac959932ac14.tar.gz | |
Import: Make DownloadThread a subobject of DiveImportedModel
Currently, desktop and mobile are accessing the DownloadThread
and the DiveImportedModel concurrently. This makes a big data
flow mess. To achieve a more hierarchical data flow, start
by making the DownloadThread a subobject of DiveImportedModel.
Start the download by calling a function in DiveImportedModel.
Route the finished signal through DiveImportedModel. Thus,
the model can reload itself with the new data.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/downloadfromdivecomputer.h')
| -rw-r--r-- | desktop-widgets/downloadfromdivecomputer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/desktop-widgets/downloadfromdivecomputer.h b/desktop-widgets/downloadfromdivecomputer.h index 5b5b18e66..f49a45f45 100644 --- a/desktop-widgets/downloadfromdivecomputer.h +++ b/desktop-widgets/downloadfromdivecomputer.h @@ -11,7 +11,6 @@ #include "core/libdivecomputer.h" #include "desktop-widgets/configuredivecomputerdialog.h" -#include "core/downloadfromdcthread.h" #include "ui_downloadfromdivecomputer.h" @@ -21,6 +20,7 @@ class QStringListModel; class DiveImportedModel; +class BTDiscovery; class DownloadFromDCWidget : public QDialog { Q_OBJECT @@ -72,7 +72,6 @@ private: QStringListModel vendorModel; QStringListModel productModel; Ui::DownloadFromDiveComputer ui; - DownloadThread thread; bool downloading; int previousLast; |