diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-10-25 14:49:47 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-11-03 13:08:51 +0000 |
| commit | fbf36811672de79f2a648af97ca73d6c0e3b1608 (patch) | |
| tree | aee123e7d84a4451118a389d62d0e32cd6635692 /src/bluetooth/qlowenergyserviceprivate_p.h | |
| parent | 7a9d2e77befb13c1f714f842d4b0ee3fea2d4a6c (diff) | |
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 <oliver.wolff@qt.io>
Diffstat (limited to 'src/bluetooth/qlowenergyserviceprivate_p.h')
| -rw-r--r-- | src/bluetooth/qlowenergyserviceprivate_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
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<QLowEnergyHandle, CharData> characteristicList; - QPointer<QLowEnergyControllerPrivateBase> controller; + QPointer<QLowEnergyControllerPrivate> controller; #if defined(QT_ANDROID_BLUETOOTH) // reference to the BluetoothGattService object |