Various cleanups following the recent QLEControllerPrivate header splits

Change-Id: Ia98a7a16c3e1e478d1c6e30d9e70dc703c1fe091
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

6 files changed, 5 insertions, 45 deletions

diff --git a/src/bluetooth/android/lowenergynotificationhub_p.h b/src/bluetooth/android/lowenergynotificationhub_p.h
index 4a384a8c..da651e68 100644
--- a/src/bluetooth/android/lowenergynotificationhub_p.h
+++ b/src/bluetooth/android/lowenergynotificationhub_p.h
@@ -56,10 +56,11 @@
 #include <QtCore/private/qjnihelpers_p.h>
 #include <QtAndroidExtras/QAndroidJniObject>
 #include <QtBluetooth/QBluetoothAddress>
+#include <QtBluetooth/QLowEnergyController>
+#include <QtBluetooth/QLowEnergyService>
 #include <jni.h>
 
 #include <QtBluetooth/QLowEnergyCharacteristic>
-#include "qlowenergycontroller_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/bluetooth/qlowenergycontroller_p.cpp b/src/bluetooth/qlowenergycontroller_p.cpp
index 3a004b69..3d1ea1e9 100644
--- a/src/bluetooth/qlowenergycontroller_p.cpp
+++ b/src/bluetooth/qlowenergycontroller_p.cpp
@@ -45,8 +45,7 @@
 QT_BEGIN_NAMESPACE
 
 QLowEnergyControllerPrivateCommon::QLowEnergyControllerPrivateCommon()
-    : QLowEnergyControllerPrivate(),
-      lastLocalHandle(0)
+    : QLowEnergyControllerPrivate()
 {
 #ifndef QT_IOS_BLUETOOTH
     printDummyWarning();
diff --git a/src/bluetooth/qlowenergycontroller_p.h b/src/bluetooth/qlowenergycontroller_p.h
index b02baaee..d7c60149 100644
--- a/src/bluetooth/qlowenergycontroller_p.h
+++ b/src/bluetooth/qlowenergycontroller_p.h
@@ -77,12 +77,9 @@ QT_END_NAMESPACE
 #include "qlowenergycontroller.h"
 #include "qlowenergycontrollerbase_p.h"
 
-#include <functional>
-
 QT_BEGIN_NAMESPACE
 
 class QLowEnergyServiceData;
-class QTimer;
 
 extern void registerQLowEnergyControllerMetaType();
 
@@ -129,28 +126,8 @@ public:
 
     void addToGenericAttributeList(const QLowEnergyServiceData &service,
                                    QLowEnergyHandle startHandle) override;
-
-
-    QLowEnergyHandle lastLocalHandle;
-
-    struct Attribute {
-        Attribute() : handle(0) {}
-
-        QLowEnergyHandle handle;
-        QLowEnergyHandle groupEndHandle;
-        QLowEnergyCharacteristic::PropertyTypes properties;
-        QBluetooth::AttAccessConstraints readConstraints;
-        QBluetooth::AttAccessConstraints writeConstraints;
-        QBluetoothUuid type;
-        QByteArray value;
-        int minLength;
-        int maxLength;
-    };
-    QVector<Attribute> localAttributes;
 };
 
-Q_DECLARE_TYPEINFO(QLowEnergyControllerPrivateCommon::Attribute, Q_MOVABLE_TYPE);
-
 QT_END_NAMESPACE
 
 #endif // QT_OSX_BLUETOOTH || QT_IOS_BLUETOOTH
diff --git a/src/bluetooth/qlowenergycontroller_winrt_p.h b/src/bluetooth/qlowenergycontroller_winrt_p.h
index 33e3e3ff..f0625bcb 100644
--- a/src/bluetooth/qlowenergycontroller_winrt_p.h
+++ b/src/bluetooth/qlowenergycontroller_winrt_p.h
@@ -120,21 +120,6 @@ public:
 
     QLowEnergyHandle lastLocalHandle;
 
-    struct Attribute {
-        Attribute() : handle(0) {}
-
-        QLowEnergyHandle handle;
-        QLowEnergyHandle groupEndHandle;
-        QLowEnergyCharacteristic::PropertyTypes properties;
-        QBluetooth::AttAccessConstraints readConstraints;
-        QBluetooth::AttAccessConstraints writeConstraints;
-        QBluetoothUuid type;
-        QByteArray value;
-        int minLength;
-        int maxLength;
-    };
-    QVector<Attribute> localAttributes;
-
 private slots:
     void characteristicChanged(int charHandle, const QByteArray &data);
 
@@ -165,8 +150,6 @@ private:
 
 };
 
-Q_DECLARE_TYPEINFO(QLowEnergyControllerPrivateWinRT::Attribute, Q_MOVABLE_TYPE);
-
 QT_END_NAMESPACE
 
 #endif // QLOWENERGYCONTROLLERPRIVATEWINRT_P_H
diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp
index 1c27603a..7e419e17 100644
--- a/src/bluetooth/qlowenergyservice.cpp
+++ b/src/bluetooth/qlowenergyservice.cpp
@@ -44,7 +44,7 @@
 
 #include <algorithm>
 
-#include "qlowenergycontroller_p.h"
+#include "qlowenergycontrollerbase_p.h"
 #include "qlowenergyserviceprivate_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/bluetooth/qlowenergyserviceprivate.cpp b/src/bluetooth/qlowenergyserviceprivate.cpp
index 83724d4e..0b8d8be0 100644
--- a/src/bluetooth/qlowenergyserviceprivate.cpp
+++ b/src/bluetooth/qlowenergyserviceprivate.cpp
@@ -39,7 +39,7 @@
 
 #include "qlowenergyserviceprivate_p.h"
 
-#include "qlowenergycontroller_p.h"
+#include "qlowenergycontrollerbase_p.h"
 
 QT_BEGIN_NAMESPACE