summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-08-26 12:27:12 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-08-26 12:27:12 -0700
commit0c410aaf5d0119854877ca6c93d0fff6609d2045 (patch)
treef91b1f7468db41883abda4b1edf6bd4e138d94fc /core
parentea8de175a74fd62117f0a543fb722b2c4d179901 (diff)
downloadsubsurface-0c410aaf5d0119854877ca6c93d0fff6609d2045.tar.gz
Adjust signature to match data we need
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core')
-rw-r--r--core/downloadfromdcthread.cpp8
-rw-r--r--core/downloadfromdcthread.h8
2 files changed, 6 insertions, 10 deletions
diff --git a/core/downloadfromdcthread.cpp b/core/downloadfromdcthread.cpp
index 43861f035..109de69b2 100644
--- a/core/downloadfromdcthread.cpp
+++ b/core/downloadfromdcthread.cpp
@@ -330,7 +330,7 @@ device_data_t* DCDeviceData::internalData()
return &data;
}
-int DCDeviceData::getDetectedVendorIndex(const QString &currentText)
+int DCDeviceData::getDetectedVendorIndex()
{
auto dcs = SettingsObjectWrapper::instance()->dive_computer_settings;
if (!dcs->dc_vendor().isEmpty()) {
@@ -351,8 +351,7 @@ int DCDeviceData::getDetectedVendorIndex(const QString &currentText)
return -1;
}
-int DCDeviceData::getDetectedProductIndex(const QString &currentVendorText,
- const QString &currentProductText)
+int DCDeviceData::getDetectedProductIndex(const QString &currentVendorText)
{
auto dcs = SettingsObjectWrapper::instance()->dive_computer_settings;
if (!dcs->dc_vendor().isEmpty()) {
@@ -377,8 +376,7 @@ int DCDeviceData::getDetectedProductIndex(const QString &currentVendorText,
return -1;
}
-QString DCDeviceData::getDetectedDeviceAddress(const QString &currentVendorText,
- const QString &currentProductText)
+QString DCDeviceData::getDetectedDeviceAddress(const QString &currentProductText)
{
#if defined(BT_SUPPORT)
// Pull the vendor from the found devices that are possible real dive computers
diff --git a/core/downloadfromdcthread.h b/core/downloadfromdcthread.h
index 0760363d5..946574125 100644
--- a/core/downloadfromdcthread.h
+++ b/core/downloadfromdcthread.h
@@ -47,11 +47,9 @@ public:
Q_INVOKABLE QStringList getProductListFromVendor(const QString& vendor);
Q_INVOKABLE int getMatchingAddress(const QString &vendor, const QString &product);
- Q_INVOKABLE int getDetectedVendorIndex(const QString &currentText);
- Q_INVOKABLE int getDetectedProductIndex(const QString &currentVendorText,
- const QString &currentProductText);
- Q_INVOKABLE QString getDetectedDeviceAddress(const QString &currentVendorText,
- const QString &currentProductText);
+ Q_INVOKABLE int getDetectedVendorIndex();
+ Q_INVOKABLE int getDetectedProductIndex(const QString &currentVendorText);
+ Q_INVOKABLE QString getDetectedDeviceAddress(const QString &currentProductText);
public slots:
void setVendor(const QString& vendor);