Share the native private code of QBluetoothLocalDevice

It makes sense to share the private code for QBluetoothLocalDevice
with other classes.

For this purpose the private class QBluetoothLocalDevicePrivate
inherits from the new QBluetoothLocalDevicePrivateData class.

Now QBluetoothLocalDevicePrivateData can be used
by QBluetoothServiceDiscoveryAgentPrivate too.

It reduces code duplication then searching for the handle of
a local device with a certain address.

Change-Id: I0bea137b231553364af9658d7d2a409fef4f40bb
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

1 files changed, 12 insertions, 9 deletions

diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h
index 383a1bb8..08ad1c54 100644
--- a/src/bluetooth/qbluetoothlocaldevice_p.h
+++ b/src/bluetooth/qbluetoothlocaldevice_p.h
@@ -242,23 +242,26 @@ private:
 
 #elif defined(Q_OS_WIN32)
 
-class QBluetoothLocalDevicePrivate : public QObject
+class QBluetoothLocalDevicePrivateData
+{
+public:
+    QBluetoothLocalDevicePrivateData(const QBluetoothAddress &address);
+    bool isValid() const;
+
+    HANDLE deviceHandle;
+    QString deviceName;
+    QBluetoothAddress deviceAddress;
+};
+
+class QBluetoothLocalDevicePrivate : public QBluetoothLocalDevicePrivateData
 {
-    Q_OBJECT
     Q_DECLARE_PUBLIC(QBluetoothLocalDevice)
 public:
     QBluetoothLocalDevicePrivate(QBluetoothLocalDevice *q, const QBluetoothAddress &address);
     ~QBluetoothLocalDevicePrivate();
 
-    void initialize(const QBluetoothAddress &address);
-
-    bool isValid() const;
-
 private:
     QBluetoothLocalDevice *q_ptr;
-    HANDLE deviceHandle;
-    QString deviceName;
-    QBluetoothAddress deviceAddress;
 };
 
 #else