diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-01-17 09:31:54 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-17 10:02:44 +0100 |
commit | 36fcfe36d720fa5dd3f0a997c565fe3898da715d (patch) | |
tree | b598bfe9f54788d3c22fb6863ac7076581dbc7e2 | |
parent | 3ecdf95b03e96e9540a9664feae23e88f117eb1f (diff) | |
download | qtconnectivity-36fcfe36d720fa5dd3f0a997c565fe3898da715d.tar.gz |
Cleanup more duplicated code in SDP discovery class.
Change-Id: I4b6be592204cc435bfec508725d64cb8f7529a3b
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
-rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp index 3d763961..2d1c6709 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp @@ -390,23 +390,12 @@ void QBluetoothServiceDiscoveryAgentPrivate::_q_deviceDiscoveryFinished() void QBluetoothServiceDiscoveryAgentPrivate::_q_deviceDiscovered(const QBluetoothDeviceInfo &info) { - if(mode == QBluetoothServiceDiscoveryAgent::FullDiscovery) { - // look for duplicates, and cached entries - for(int i = 0; i < discoveredDevices.count(); i++){ - if(discoveredDevices.at(i).address() == info.address()){ - discoveredDevices.removeAt(i); - } - } - discoveredDevices.prepend(info); - } - else { - for(int i = 0; i < discoveredDevices.count(); i++){ - if(discoveredDevices.at(i).address() == info.address()){ - discoveredDevices.removeAt(i); - } - } - discoveredDevices.prepend(info); + // look for duplicates, and cached entries + for (int i = 0; i < discoveredDevices.count(); i++) { + if (discoveredDevices.at(i).address() == info.address()) + discoveredDevices.removeAt(i); } + discoveredDevices.prepend(info); } void QBluetoothServiceDiscoveryAgentPrivate::_q_deviceDiscoveryError(QBluetoothDeviceDiscoveryAgent::Error newError) |