Reduce platform specific code lines

QLEController(QBluetoothAddress) ctor is not usable on iOS and OSX.
On those platforms we have to use QLECOntroller(QBluetoothDeviceInfo).

We mark the QBluetoothAddress based ctors of QLEController obsolete
and remove most uses of them. This cleans up some ifdefs throughout
the QtBluetooth code base.

Change-Id: Ibe1e3fa271a29461e39fc3c0eeba7a910a250077
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>

2 files changed, 46 insertions, 65 deletions

diff --git a/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp b/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp
index ffed9f6f..de77046e 100644
--- a/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp
+++ b/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp
@@ -75,7 +75,7 @@ private slots:
     void tst_assignCompare();
 
 private:
-    QSet<QString> remoteLeDevices;
+    QList<QBluetoothDeviceInfo> remoteLeDevices;
     QLowEnergyController *globalControl;
     QLowEnergyService *globalService;
 };
@@ -121,9 +121,10 @@ void tst_QLowEnergyCharacteristic::initTestCase()
 
     // find first service with descriptor
     QLowEnergyController *controller = 0;
-    foreach (const QString &remoteDevice, remoteLeDevices.toList()) {
-        controller = new QLowEnergyController(QBluetoothAddress(remoteDevice), this);
-        qDebug() << "Connecting to" << remoteDevice;
+    foreach (const QBluetoothDeviceInfo &remoteDevice, remoteLeDevices) {
+        controller = new QLowEnergyController(remoteDevice, this);
+        qDebug() << "Connecting to" << remoteDevice.name()
+                 << remoteDevice.address() << remoteDevice.deviceUuid();
         controller->connectToDevice();
         QTRY_IMPL(controller->state() != QLowEnergyController::ConnectingState,
                   20000);
@@ -158,7 +159,7 @@ void tst_QLowEnergyCharacteristic::initTestCase()
                 if (!ch.descriptors().isEmpty()) {
                     globalService = leService;
                     globalControl = controller;
-                    qWarning() << "Found service with descriptor" << remoteDevice
+                    qWarning() << "Found service with descriptor" << remoteDevice.address()
                                << globalService->serviceName() << globalService->serviceUuid();
                     break;
                 }
@@ -191,7 +192,7 @@ void tst_QLowEnergyCharacteristic::cleanupTestCase()
 void tst_QLowEnergyCharacteristic::deviceDiscovered(const QBluetoothDeviceInfo &info)
 {
     if (info.coreConfigurations() & QBluetoothDeviceInfo::LowEnergyCoreConfiguration)
-        remoteLeDevices.insert(info.address().toString());
+        remoteLeDevices.append(info);
 }
 
 void tst_QLowEnergyCharacteristic::tst_constructionDefault()
diff --git a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
index 5faf5fee..50ecc099 100644
--- a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
+++ b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
@@ -156,8 +156,8 @@ void tst_QLowEnergyController::initTestCase()
         // On OS X/iOS the only way to find the device we are
         // interested in - is to use device's name.
         if (info.name().contains("Sensor") && info.name().contains("Tag")) {
-            remoteDeviceInfo = info;
 #endif
+            remoteDeviceInfo = info;
             deviceFound = true;
             break;
         }
@@ -249,31 +249,23 @@ void tst_QLowEnergyController::tst_connect()
 {
     QList<QBluetoothHostInfo> localAdapters = QBluetoothLocalDevice::allDevices();
 
-#ifndef Q_OS_MAC
-    if (localAdapters.isEmpty() || remoteDevice.isNull())
-#elif defined(Q_OS_OSX)
-    if (localAdapters.isEmpty() || remoteDeviceInfo.deviceUuid().isNull())
-#elif defined (Q_OS_IOS)
-    if (remoteDeviceInfo.deviceUuid().isNull())
+#ifdef Q_OS_IOS
+    if (remoteDeviceInfo.isValid())
+#else
+    if (localAdapters.isEmpty() || !remoteDeviceInfo.isValid())
 #endif
         QSKIP("No local Bluetooth or remote BTLE device found. Skipping test.");
 
-#ifndef Q_OS_IOS
-    const QBluetoothAddress localAdapter = localAdapters.at(0).address();
-#endif
-
-#ifndef Q_OS_MAC
-    QLowEnergyController control(remoteDevice);
-#else
-    // Create a low energy controller using Apple's
-    // uuid (NSUUID).
     QLowEnergyController control(remoteDeviceInfo);
-#endif
-
     QSignalSpy connectedSpy(&control, SIGNAL(connected()));
     QSignalSpy disconnectedSpy(&control, SIGNAL(disconnected()));
+    if (remoteDeviceInfo.name().isEmpty())
+        QVERIFY(control.remoteName().isEmpty());
+    else
+        QCOMPARE(control.remoteName(), remoteDeviceInfo.name());
 
 #ifndef Q_OS_IOS
+    const QBluetoothAddress localAdapter = localAdapters.at(0).address();
     QCOMPARE(control.localAddress(), localAdapter);
     QVERIFY(!control.localAddress().isNull());
 #endif
@@ -417,16 +409,14 @@ void tst_QLowEnergyController::tst_concurrentDiscovery()
 {
 #ifndef Q_OS_MAC
     QList<QBluetoothHostInfo> localAdapters = QBluetoothLocalDevice::allDevices();
-    if (localAdapters.isEmpty() || remoteDevice.isNull())
-        QSKIP("No local Bluetooth or remote BTLE device found. Skipping test.");
+    if (localAdapters.isEmpty())
+        QSKIP("No local Bluetooth device found. Skipping test.");
+#endif
 
-    // quick setup - more elaborate test is done by connectNew()
-    QLowEnergyController control(remoteDevice);
-#else
-    if (remoteDeviceInfo.deviceUuid().isNull())
-        QSKIP("No local Bluetooth or remote BTLE device found. Skipping test.");
+    if (!remoteDeviceInfo.isValid())
+        QSKIP("No remote BTLE device found. Skipping test.");
     QLowEnergyController control(remoteDeviceInfo);
-#endif
+
 
     QCOMPARE(control.state(), QLowEnergyController::UnconnectedState);
     QCOMPARE(control.error(), QLowEnergyController::NoError);
@@ -1659,16 +1649,13 @@ void tst_QLowEnergyController::tst_writeCharacteristic()
 {
 #ifndef Q_OS_MAC
     QList<QBluetoothHostInfo> localAdapters = QBluetoothLocalDevice::allDevices();
-    if (localAdapters.isEmpty() || remoteDevice.isNull())
-        QSKIP("No local Bluetooth or remote BTLE device found. Skipping test.");
+    if (localAdapters.isEmpty())
+        QSKIP("No local Bluetooth device found. Skipping test.");
+#endif
 
-    // quick setup - more elaborate test is done by connect()
-    QLowEnergyController control(remoteDevice);
-#else
-    if (remoteDeviceInfo.deviceUuid().isNull())
-        QSKIP("No local Bluetooth or remote BTLE device found. Skipping test.");
+    if (!remoteDeviceInfo.isValid())
+        QSKIP("No remote BTLE device found. Skipping test.");
     QLowEnergyController control(remoteDeviceInfo);
-#endif
 
     QCOMPARE(control.error(), QLowEnergyController::NoError);
 
@@ -1836,14 +1823,14 @@ void tst_QLowEnergyController::tst_readWriteDescriptor()
 {
 #ifndef Q_OS_MAC
     QList<QBluetoothHostInfo> localAdapters = QBluetoothLocalDevice::allDevices();
-    if (localAdapters.isEmpty() || remoteDevice.isNull())
-        QSKIP("No local Bluetooth or remote BTLE device found. Skipping test.");
-    QLowEnergyController control(remoteDevice);
-#else
-    if (remoteDeviceInfo.deviceUuid().isNull())
-        QSKIP("No local Bluetooth or remote BTLE device found. Skipping test.");
-    QLowEnergyController control(remoteDeviceInfo);
+    if (localAdapters.isEmpty())
+        QSKIP("No local Bluetooth device found. Skipping test.");
 #endif
+
+    if (!remoteDeviceInfo.isValid())
+        QSKIP("No remote BTLE device found. Skipping test.");
+    QLowEnergyController control(remoteDeviceInfo);
+
     // quick setup - more elaborate test is done by connect()
     control.connectToDevice();
     {
@@ -2259,17 +2246,13 @@ void tst_QLowEnergyController::tst_errorCases()
 {
 #ifndef Q_OS_MAC
     QList<QBluetoothHostInfo> localAdapters = QBluetoothLocalDevice::allDevices();
-    if (localAdapters.isEmpty() || remoteDevice.isNull())
-        QSKIP("No local Bluetooth or remote BTLE device found. Skipping test.");
-
-    // quick setup - more elaborate test is done by connect()
-    QLowEnergyController control(remoteDevice);
-#else
-    if (remoteDeviceInfo.deviceUuid().isNull())
-        QSKIP("No local Bluetooth or remote BTLE device found. Skipping test.");
+    if (localAdapters.isEmpty())
+        QSKIP("No local Bluetooth device found. Skipping test.");
+#endif
 
+    if (!remoteDeviceInfo.isValid())
+        QSKIP("No remote BTLE device found. Skipping test.");
     QLowEnergyController control(remoteDeviceInfo);
-#endif
     QCOMPARE(control.error(), QLowEnergyController::NoError);
 
     control.connectToDevice();
@@ -2485,17 +2468,14 @@ void tst_QLowEnergyController::tst_writeCharacteristicNoResponse()
 {
 #ifndef Q_OS_MAC
     QList<QBluetoothHostInfo> localAdapters = QBluetoothLocalDevice::allDevices();
-    if (localAdapters.isEmpty() || remoteDevice.isNull())
-        QSKIP("No local Bluetooth or remote BTLE device found. Skipping test.");
-
-    // quick setup - more elaborate test is done by connect()
-    QLowEnergyController control(remoteDevice);
-#else
-    if (remoteDeviceInfo.deviceUuid().isNull())
-        QSKIP("No local Bluetooth or remote BTLE device found. Skipping test.");
+    if (localAdapters.isEmpty())
+        QSKIP("No local Bluetooth device found. Skipping test.");
+#endif
 
+    if (!remoteDeviceInfo.isValid())
+        QSKIP("No remote BTLE device found. Skipping test.");
     QLowEnergyController control(remoteDeviceInfo);
-#endif
+
     QCOMPARE(control.error(), QLowEnergyController::NoError);
 
     control.connectToDevice();