Code cleanup: Avoid repeated service info duplication check

Change-Id: I00701e9103a6acfdfc2697949280f8a7de8bcdfe
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

1 files changed, 1 insertions, 12 deletions

diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
index 11882d01..d65d638d 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
@@ -306,19 +306,8 @@ void QBluetoothServiceDiscoveryAgentPrivate::remoteDevicesChanged(int fd)
         serviceInfo.setAttribute(QBluetoothServiceInfo::BrowseGroupList,
                                      QBluetoothUuid(QBluetoothUuid::PublicBrowseGroup));
 
-        bool entryExists = false;
         //Did we already discover this service?
-        foreach (QBluetoothServiceInfo sInfo, q_ptr->discoveredServices()) {
-            if (sInfo.device() == serviceInfo.device()
-                    && sInfo.serviceUuid() == serviceInfo.serviceUuid()
-                    && sInfo.serviceClassUuids() == serviceInfo.serviceClassUuids()) {
-                entryExists = true;
-                //qCDebug(QT_BT_QNX) << "Entry exists" << serviceInfo.serviceClassUuids().first() << sInfo.serviceClassUuids().first();
-                break;
-            }
-        }
-
-        if (!entryExists) {
+        if (!isDuplicatedService(serviceInfo)) {
             qCDebug(QT_BT_QNX) << "Adding service" << next_service << " " << serviceInfo.socketProtocol();
             discoveredServices << serviceInfo;
             q_ptr->serviceDiscovered(serviceInfo);