add remoteName() method to QLowEnergyController

Task-number: QTBUG-45435
Change-Id: I3ded6bf88d3980481e386073ce160d5d54520034
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>

5 files changed, 24 insertions, 0 deletions

diff --git a/src/bluetooth/qlowenergycontroller.cpp b/src/bluetooth/qlowenergycontroller.cpp
index 79359345..0953ad5d 100644
--- a/src/bluetooth/qlowenergycontroller.cpp
+++ b/src/bluetooth/qlowenergycontroller.cpp
@@ -420,6 +420,7 @@ QLowEnergyController::QLowEnergyController(
     d->remoteDevice = remoteDeviceInfo.address();
     d->localAdapter = QBluetoothLocalDevice().address();
     d->addressType = QLowEnergyController::PublicAddress;
+    d->remoteName = remoteDeviceInfo.name();
 }
 
 /*!
@@ -480,6 +481,16 @@ QBluetoothAddress QLowEnergyController::remoteAddress() const
 }
 
 /*!
+    Returns the name of the remote Bluetooth Low Energy device.
+
+    \since 5.5
+ */
+QString QLowEnergyController::remoteName() const
+{
+    return d_ptr->remoteName;
+}
+
+/*!
     Returns the current state of the controller.
 
     \sa stateChanged()
diff --git a/src/bluetooth/qlowenergycontroller.h b/src/bluetooth/qlowenergycontroller.h
index 1d29502b..f3a6603e 100644
--- a/src/bluetooth/qlowenergycontroller.h
+++ b/src/bluetooth/qlowenergycontroller.h
@@ -82,6 +82,8 @@ public:
     QBluetoothAddress localAddress() const;
     QBluetoothAddress remoteAddress() const;
 
+    QString remoteName() const;
+
     ControllerState state() const;
 
     RemoteAddressType remoteAddressType() const;
diff --git a/src/bluetooth/qlowenergycontroller_osx.mm b/src/bluetooth/qlowenergycontroller_osx.mm
index e3cf57b1..c4628069 100644
--- a/src/bluetooth/qlowenergycontroller_osx.mm
+++ b/src/bluetooth/qlowenergycontroller_osx.mm
@@ -151,6 +151,7 @@ QLowEnergyControllerPrivateOSX::QLowEnergyControllerPrivateOSX(QLowEnergyControl
                                                                const QBluetoothDeviceInfo &deviceInfo)
     : q_ptr(q),
       deviceUuid(deviceInfo.deviceUuid()),
+      deviceName(deviceInfo.name()),
       isConnecting(false),
       lastError(QLowEnergyController::NoError),
       controllerState(QLowEnergyController::UnconnectedState),
@@ -855,6 +856,13 @@ QBluetoothAddress QLowEnergyController::remoteAddress() const
     return osx_d_ptr->remoteAddress;
 }
 
+QString QLowEnergyController::remoteName() const
+{
+   OSX_D_PTR;
+
+   return osx_d_ptr->deviceName;
+}
+
 QLowEnergyController::ControllerState QLowEnergyController::state() const
 {
     OSX_D_PTR;
diff --git a/src/bluetooth/qlowenergycontroller_osx_p.h b/src/bluetooth/qlowenergycontroller_osx_p.h
index 96af6db0..1a4d5707 100644
--- a/src/bluetooth/qlowenergycontroller_osx_p.h
+++ b/src/bluetooth/qlowenergycontroller_osx_p.h
@@ -131,6 +131,7 @@ private:
 
     QLowEnergyController *q_ptr;
     QBluetoothUuid deviceUuid;
+    QString deviceName;
     // To be sure we set controller's state correctly
     // (Connecting or Connected) we have to know if we're
     // still inside connectToDevice - this is important,
diff --git a/src/bluetooth/qlowenergycontroller_p.h b/src/bluetooth/qlowenergycontroller_p.h
index ab90ab84..bb26a538 100644
--- a/src/bluetooth/qlowenergycontroller_p.h
+++ b/src/bluetooth/qlowenergycontroller_p.h
@@ -132,6 +132,8 @@ public:
     QBluetoothAddress remoteDevice;
     QBluetoothAddress localAdapter;
 
+    QString remoteName;
+
     QLowEnergyController::ControllerState state;
     QLowEnergyController::Error error;
     QString errorString;