diff options
| author |  jan Iversen <jani@libreoffice.org> | 2018-06-09 12:31:31 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-06-09 21:19:46 +0200 |
| commit | acc9784fd9d7bc5695cc862132d2bb0ee7f87f48 (patch) | |
| tree | 30c65f607ccaff15e7ea4326ee458a96f8bdb6de /core/downloadfromdcthread.h | |
| parent | f7e8f2124503d3952a9fc6838a4fb8f2e2e09878 (diff) | |
| download | subsurface-acc9784fd9d7bc5695cc862132d2bb0ee7f87f48.tar.gz | |
core: remove qml properties from desktop compile
add #ifdef SUBSURFACE_MOBILE to secure qml macros are not
compiled with desktop
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'core/downloadfromdcthread.h')
| -rw-r--r-- | core/downloadfromdcthread.h | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/core/downloadfromdcthread.h b/core/downloadfromdcthread.h index f36676943..685c6e5e8 100644 --- a/core/downloadfromdcthread.h +++ b/core/downloadfromdcthread.h @@ -14,6 +14,7 @@ /* Helper object for access of Device Data in QML */ class DCDeviceData : public QObject { Q_OBJECT +#ifdef SUBSURFACE_MOBILE Q_PROPERTY(QString vendor READ vendor WRITE setVendor) Q_PROPERTY(QString product READ product WRITE setProduct) Q_PROPERTY(bool bluetoothMode READ bluetoothMode WRITE setBluetoothMode) @@ -26,6 +27,7 @@ class DCDeviceData : public QObject { Q_PROPERTY(int diveId READ diveId WRITE setDiveId) Q_PROPERTY(bool saveDump READ saveDump WRITE setSaveDump) Q_PROPERTY(bool saveLog READ saveLog WRITE setSaveLog) +#endif // SUBSURFACE_MOBILE public: DCDeviceData(QObject *parent = nullptr); @@ -34,26 +36,42 @@ public: QString vendor() const; QString product() const; QString devName() const; + bool bluetoothMode() const; + bool saveDump() const; QString devBluetoothName() const; +#ifdef SUBSURFACE_MOBILE QString descriptor() const; - bool bluetoothMode() const; bool forceDownload() const; bool createNewTrip() const; - bool saveDump() const; bool saveLog() const; int deviceId() const; int diveId() const; +#endif // SUBSURFACE_MOBILE /* this needs to be a pointer to make the C-API happy */ device_data_t* internalData(); +#ifdef SUBSURFACE_MOBILE Q_INVOKABLE QStringList getProductListFromVendor(const QString& vendor); Q_INVOKABLE int getMatchingAddress(const QString &vendor, const QString &product); Q_INVOKABLE int getDetectedVendorIndex(); Q_INVOKABLE int getDetectedProductIndex(const QString ¤tVendorText); +#else + QStringList getProductListFromVendor(const QString& vendor); + int getMatchingAddress(const QString &vendor, const QString &product); + + int getDetectedVendorIndex(); + int getDetectedProductIndex(const QString ¤tVendorText); +#endif // SUBSURFACE_MOBILE +#ifdef SUBSURFACE_MOBILE public slots: + void setDeviceId(int deviceId); + void setDiveId(int diveId); +#else +public: +#endif // SUBSURFACE_MOBILE void setVendor(const QString& vendor); void setProduct(const QString& product); void setDevName(const QString& devName); @@ -61,8 +79,6 @@ public slots: void setBluetoothMode(bool mode); void setForceDownload(bool force); void setCreateNewTrip(bool create); - void setDeviceId(int deviceId); - void setDiveId(int diveId); void setSaveDump(bool dumpMode); void setSaveLog(bool saveLog); private: @@ -75,13 +91,19 @@ private: class DownloadThread : public QThread { Q_OBJECT +#ifdef SUBSURFACE_MOBILE Q_PROPERTY(DCDeviceData* deviceData MEMBER m_data) +#endif // SUBSURFACE_MOBILE public: DownloadThread(); void run() override; +#ifdef SUBSURFACE_MOBILE Q_INVOKABLE DCDeviceData *data(); +#else + DCDeviceData *data(); +#endif // SUBSURFACE_MOBILE QString error; private: |