From ff9506b21bbb9910256841dcb577bcb2e19047e8 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 13 Jan 2019 10:58:04 +0200 Subject: Import: don't add to new trip while downloading Since process_imported_dives() can add dives to a newly generated trip, this need not be done in the downloading code. This makes data flow distinctly simpler, as no trip table and no add-new-trip flag has to be passed down to the libdivecomputer glue code. Moreover, since now the trip creation is done at the import step rather than the download step, the latest status of the "add to new trip" checkbox will be considered. Signed-off-by: Berthold Stoeger --- core/downloadfromdcthread.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'core/downloadfromdcthread.h') diff --git a/core/downloadfromdcthread.h b/core/downloadfromdcthread.h index 506a75ac0..da8bec994 100644 --- a/core/downloadfromdcthread.h +++ b/core/downloadfromdcthread.h @@ -26,7 +26,6 @@ public: QString devBluetoothName() const; QString descriptor() const; bool forceDownload() const; - bool createNewTrip() const; bool saveLog() const; int deviceId() const; int diveId() const; @@ -48,7 +47,6 @@ public: void setDevBluetoothName(const QString& devBluetoothName); void setBluetoothMode(bool mode); void setForceDownload(bool force); - void setCreateNewTrip(bool create); void setSaveDump(bool dumpMode); void setSaveLog(bool saveLog); private: @@ -61,7 +59,6 @@ private: class DownloadThread : public QThread { Q_OBJECT Q_PROPERTY(dive_table_t *table READ table CONSTANT) - Q_PROPERTY(trip_table_t *trips READ trips CONSTANT) public: DownloadThread(); @@ -69,7 +66,6 @@ public: DCDeviceData *data(); struct dive_table *table(); - struct trip_table *trips(); QString error; private: -- cgit v1.2.3-70-g09d2