From fbf36811672de79f2a648af97ca73d6c0e3b1608 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 25 Oct 2017 14:49:47 +0200 Subject: Rename various QLEControllerPrivate classes The base class is renamed to QLEControllerPrivate and the existing QLEControllerPrivate becomes QLEControllerPrivateCommon. This is necessary to re-enable Q_DECLARE_PRIVATE. The macro uses by convention the "Private" class prefix which is currently broken because not every implementation uses QLEControllerPrivate as d-pointer type. This also avoids a SC/BC break in qlowenergycontroller.h as the d-pointer remains the same and the functions declared via Q_DECLARE_PRIVATE still return the same type. Change-Id: I84890b06280b2c473a4d370606d3bbc58a258eea Reviewed-by: Oliver Wolff --- src/bluetooth/qlowenergyserviceprivate_p.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/bluetooth/qlowenergyserviceprivate_p.h') diff --git a/src/bluetooth/qlowenergyserviceprivate_p.h b/src/bluetooth/qlowenergyserviceprivate_p.h index 3a0edd8a..7727b583 100644 --- a/src/bluetooth/qlowenergyserviceprivate_p.h +++ b/src/bluetooth/qlowenergyserviceprivate_p.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE -class QLowEnergyControllerPrivateBase; +class QLowEnergyControllerPrivate; class QLowEnergyServicePrivate : public QObject { @@ -92,7 +92,7 @@ public: Characteristic = 0x2803 }; - void setController(QLowEnergyControllerPrivateBase* control); + void setController(QLowEnergyControllerPrivate* control); void setError(QLowEnergyService::ServiceError newError); void setState(QLowEnergyService::ServiceState newState); @@ -122,7 +122,7 @@ public: QHash characteristicList; - QPointer controller; + QPointer controller; #if defined(QT_ANDROID_BLUETOOTH) // reference to the BluetoothGattService object -- cgit v1.2.3