diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-12-10 14:49:32 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-12-17 07:37:32 -0800 |
| commit | bfe69239df6a8d2b2ae986b850246727a21e127b (patch) | |
| tree | 04c5eeb37790f81861f80a93b28fa752d9a1fe9b /qt-models/diveimportedmodel.cpp | |
| parent | a6a5cf61e2f45eb54721c7ee2dbcc05afe8939f9 (diff) | |
| download | subsurface-bfe69239df6a8d2b2ae986b850246727a21e127b.tar.gz | |
Import: unglobalize downloadTable
To make data flow more clear, unglobalize the downloadTable object.
Make it a subobject of DownloadThread. The difficult part was making
this compatible with QML, because somehow the pointer to the
download-table has to be passed to the DiveImportedModel. Desktop would
simply pass it to the constructor. But with objects generated in QML
this is not possible. Instead, pass the table in the repopulate()
function. This seems to make sense, but for this to work, we have to
declare pointer-to-dive-table as a Q_METATYPE. And this only works
if we use a typedef, because MOC removes the "struct" from "struct
dive_table". This leads to compilation errors, because dive_table is
the symbol-name of the global dive table! Sigh.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'qt-models/diveimportedmodel.cpp')
| -rw-r--r-- | qt-models/diveimportedmodel.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/qt-models/diveimportedmodel.cpp b/qt-models/diveimportedmodel.cpp index be9b4275d..3e8386b94 100644 --- a/qt-models/diveimportedmodel.cpp +++ b/qt-models/diveimportedmodel.cpp @@ -6,8 +6,6 @@ DiveImportedModel::DiveImportedModel(QObject *o) : QAbstractTableModel(o), lastIndex(-1), diveTable(nullptr) { - // Defaults to downloadTable, can be changed later. - diveTable = &downloadTable; } int DiveImportedModel::columnCount(const QModelIndex&) const @@ -45,11 +43,6 @@ QVariant DiveImportedModel::headerData(int section, Qt::Orientation orientation, return QVariant(); } -void DiveImportedModel::setDiveTable(struct dive_table* table) -{ - diveTable = table; -} - QVariant DiveImportedModel::data(const QModelIndex &index, int role) const { if (!index.isValid()) @@ -134,10 +127,11 @@ void DiveImportedModel::clearTable() endRemoveRows(); } -void DiveImportedModel::repopulate() +void DiveImportedModel::repopulate(dive_table_t *table) { beginResetModel(); + diveTable = table; firstIndex = 0; lastIndex = diveTable->nr - 1; checkStates.resize(diveTable->nr); @@ -159,7 +153,7 @@ void DiveImportedModel::recordDives() if (checkStates[i]) j++; else - delete_dive_from_table(&downloadTable, j); + delete_dive_from_table(diveTable, j); } process_imported_dives(diveTable, true, true); |