diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-15 07:40:26 -0400 |
|---|---|---|
| committer |  bstoeger <32835590+bstoeger@users.noreply.github.com> | 2018-10-15 19:46:18 +0200 |
| commit | a20626a8741fe0042287ae11abd0041310c1692f (patch) | |
| tree | 46021bb49c2b57775638ab1b103cbaadea9effa4 /core | |
| parent | 5b925d29af8e678c8bead4b594aebe8e5903b570 (diff) | |
| download | subsurface-a20626a8741fe0042287ae11abd0041310c1692f.tar.gz | |
Bluetooth cleanup: remove pointless download_mode
This was used to track whether we had selected the native BT mode in the
download dialog. But the information is redundant as we can tell from the
device name whether this is a BT/BLE download or not.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/pref.h | 1 | ||||
| -rw-r--r-- | core/settings/qPrefDiveComputer.cpp | 2 | ||||
| -rw-r--r-- | core/settings/qPrefDiveComputer.h | 9 |
3 files changed, 0 insertions, 12 deletions
diff --git a/core/pref.h b/core/pref.h index 2fbe1762f..2e283fc3a 100644 --- a/core/pref.h +++ b/core/pref.h @@ -63,7 +63,6 @@ typedef struct { const char *product; const char *device; const char *device_name; - int download_mode; } dive_computer_prefs_t; enum unit_system_values { diff --git a/core/settings/qPrefDiveComputer.cpp b/core/settings/qPrefDiveComputer.cpp index c5e131bec..6e9cc45f1 100644 --- a/core/settings/qPrefDiveComputer.cpp +++ b/core/settings/qPrefDiveComputer.cpp @@ -20,7 +20,6 @@ void qPrefDiveComputer::loadSync(bool doSync) // last computer used disk_device(doSync); disk_device_name(doSync); - disk_download_mode(doSync); disk_product(doSync); disk_vendor(doSync); @@ -41,7 +40,6 @@ void qPrefDiveComputer::loadSync(bool doSync) // these are the 'active' settings HANDLE_PREFERENCE_TXT_EXT(DiveComputer, "dive_computer_device", device, dive_computer.) HANDLE_PREFERENCE_TXT_EXT(DiveComputer, "dive_computer_device_name", device_name, dive_computer.) -HANDLE_PREFERENCE_INT_EXT(DiveComputer, "dive_computer_download_mode", download_mode, dive_computer.) HANDLE_PREFERENCE_TXT_EXT(DiveComputer, "dive_computer_product", product, dive_computer.) HANDLE_PREFERENCE_TXT_EXT(DiveComputer, "dive_computer_vendor", vendor, dive_computer.) diff --git a/core/settings/qPrefDiveComputer.h b/core/settings/qPrefDiveComputer.h index 6b97b1bcc..cb79c7edb 100644 --- a/core/settings/qPrefDiveComputer.h +++ b/core/settings/qPrefDiveComputer.h @@ -34,7 +34,6 @@ class qPrefDiveComputer : public QObject { Q_PROPERTY(QString vendor2 READ vendor2 WRITE set_vendor2 NOTIFY vendor2Changed) Q_PROPERTY(QString vendor3 READ vendor3 WRITE set_vendor3 NOTIFY vendor3Changed) Q_PROPERTY(QString vendor4 READ vendor4 WRITE set_vendor4 NOTIFY vendor4Changed) - Q_PROPERTY(int download_mode READ download_mode WRITE set_download_mode NOTIFY download_modeChanged) public: qPrefDiveComputer(QObject *parent = NULL); @@ -50,7 +49,6 @@ public: IMPLEMENT5GETTERS(device_name) IMPLEMENT5GETTERS(product) IMPLEMENT5GETTERS(vendor) - static int download_mode() { return prefs.dive_computer.download_mode; } public slots: static void set_device(const QString &device); @@ -77,8 +75,6 @@ public slots: static void set_vendor3(const QString &vendor); static void set_vendor4(const QString &vendor); - static void set_download_mode(int mode); - signals: void deviceChanged(const QString &device); void device1Changed(const QString &device); @@ -104,8 +100,6 @@ signals: void vendor3Changed(const QString &vendor); void vendor4Changed(const QString &vendor); - void download_modeChanged(int mode); - private: // functions to load/sync variable with disk @@ -132,9 +126,6 @@ private: static void disk_vendor2(bool doSync); static void disk_vendor3(bool doSync); static void disk_vendor4(bool doSync); - - static void disk_download_mode(bool doSync); - }; #endif |