diff options
| author |  jan Iversen <jani@libreoffice.org> | 2018-06-09 16:59:02 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-06-09 21:19:46 +0200 |
| commit | 470c218b79a582856aff6227a90147e0db52812b (patch) | |
| tree | d232f5b099f723bfaee75eb801beb61884b79bf3 /core/downloadfromdcthread.cpp | |
| parent | 807571a5887baa71f7271bf0fff2397090ec9489 (diff) | |
| download | subsurface-470c218b79a582856aff6227a90147e0db52812b.tar.gz | |
core: remove qml properties from downloadfromcthread
Remove Q_OBJECT and qml properties from DCDeviceData class
Remove DCDeviceData register from mobile-helper.cpp
Change DCDeviceData constructor to be without parameters
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'core/downloadfromdcthread.cpp')
| -rw-r--r-- | core/downloadfromdcthread.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/core/downloadfromdcthread.cpp b/core/downloadfromdcthread.cpp index 69c41c229..0027bdcea 100644 --- a/core/downloadfromdcthread.cpp +++ b/core/downloadfromdcthread.cpp @@ -205,7 +205,7 @@ void show_computer_list() } DCDeviceData *DCDeviceData::m_instance = NULL; -DCDeviceData::DCDeviceData(QObject *parent) : QObject(parent) +DCDeviceData::DCDeviceData() { memset(&data, 0, sizeof(data)); data.trip = nullptr; @@ -227,7 +227,7 @@ DCDeviceData::DCDeviceData(QObject *parent) : QObject(parent) DCDeviceData *DCDeviceData::instance() { if (!m_instance) - m_instance = new DCDeviceData(); + m_instance = new DCDeviceData; return m_instance; } @@ -282,19 +282,16 @@ QString DCDeviceData::devBluetoothName() const return m_devBluetoothName; } -#ifdef SUBSURFACE_MOBILE QString DCDeviceData::descriptor() const { return ""; } -#endif // SUBSURFACE_MOBILE bool DCDeviceData::bluetoothMode() const { return data.bluetooth_mode; } -#ifdef SUBSURFACE_MOBILE bool DCDeviceData::forceDownload() const { return data.force_download; @@ -314,7 +311,6 @@ int DCDeviceData::diveId() const { return data.diveid; } -#endif // SUBSURFACE_MOBILE void DCDeviceData::setVendor(const QString& vendor) { @@ -367,7 +363,6 @@ void DCDeviceData::setCreateNewTrip(bool create) data.create_new_trip = create; } -#ifdef SUBSURFACE_MOBILE void DCDeviceData::setDeviceId(int deviceId) { data.deviceid = deviceId; @@ -377,7 +372,6 @@ void DCDeviceData::setDiveId(int diveId) { data.diveid = diveId; } -#endif // SUBSURFACE_MOBILE void DCDeviceData::setSaveDump(bool save) { @@ -394,12 +388,10 @@ void DCDeviceData::setSaveLog(bool saveLog) data.libdc_log = saveLog; } -#ifdef SUBSURFACE_MOBILE bool DCDeviceData::saveLog() const { return data.libdc_log; } -#endif // SUBSURFACE_MOBILE device_data_t* DCDeviceData::internalData() |