Import: add trip_table argument to DiveImportedModel::repopulate()

In the future we want to download trips into a distinct trip-table
instead of the global trip-table to allow for undo of import.

Therefore add a trip_table argument to DiveImportedModel::repopulate()
and a trip_table member to DiveImportedModel. To correctly set these,
add a DownloadThread::trips() function, which currently simply returns
the global trip table.

Finally, make "struct trip_table *" a Q_METATYPE, so that the corresponding
arguments can be passed from QML.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 6 insertions, 0 deletions

diff --git a/core/downloadfromdcthread.cpp b/core/downloadfromdcthread.cpp
index 2fdebf129..adcdea02b 100644
--- a/core/downloadfromdcthread.cpp
+++ b/core/downloadfromdcthread.cpp
@@ -307,6 +307,12 @@ struct dive_table *DownloadThread::table()
 	return &downloadTable;
 }
 
+struct trip_table *DownloadThread::trips()
+{
+	// TODO: Replace by local trip-table
+	return &trip_table;
+}
+
 QString DCDeviceData::vendor() const
 {
 	return data.vendor;