diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-06-24 09:24:18 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-06-27 13:54:28 +0000 |
| commit | ee271934bf86193c4aabc95b7b870ccb761d4924 (patch) | |
| tree | da87b8a21c80ce637332719b54a0ae2782b8a9db /src | |
| parent | e69fed2980b48e21035b1be930901f2d8856b725 (diff) | |
Simplify setLowEnergyTimeout() on iOS and OSX
These two platforms always use a timeout. There is no need to test for
a disabled timeout feature.
Change-Id: If066c286d283ae793ef2b41794587792511a5926
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_ios.mm | 5 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_ios.mm b/src/bluetooth/qbluetoothdevicediscoveryagent_ios.mm index aac4f7d5..2c2b4fe7 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_ios.mm +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_ios.mm @@ -390,9 +390,8 @@ int QBluetoothDeviceDiscoveryAgent::lowEnergyDiscoveryTimeout() const void QBluetoothDeviceDiscoveryAgent::setLowEnergyDiscoveryTimeout(int timeout) { // cannot deliberately turn it off - if (d_ptr->lowEnergySearchTimeout < 0 || timeout < 0) { - qCDebug(QT_BT_OSX) << "The Bluetooth Low Energy device discovery timeout cannot be negative " - "or set on a backend which does not support this feature."; + if (timeout < 0) { + qCDebug(QT_BT_OSX) << "The Bluetooth Low Energy device discovery timeout cannot be negative."; return; } diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm index 48f84357..02a45f18 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm @@ -588,9 +588,8 @@ QString QBluetoothDeviceDiscoveryAgent::errorString() const void QBluetoothDeviceDiscoveryAgent::setLowEnergyDiscoveryTimeout(int timeout) { // cannot deliberately turn it off - if (d_ptr->lowEnergySearchTimeout < 0 || timeout < 0) { - qCDebug(QT_BT_OSX) << "The Bluetooth Low Energy device discovery timeout cannot be negative " - "or set on a backend which does not support this feature."; + if (timeout < 0) { + qCDebug(QT_BT_OSX) << "The Bluetooth Low Energy device discovery timeout cannot be negative."; return; } |