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/qlowenergycontroller.cpp | |
| 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/qlowenergycontroller.cpp')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/bluetooth/qlowenergycontroller.cpp b/src/bluetooth/qlowenergycontroller.cpp index b026e4a0..34b7cbec 100644 --- a/src/bluetooth/qlowenergycontroller.cpp +++ b/src/bluetooth/qlowenergycontroller.cpp @@ -305,9 +305,9 @@ QLowEnergyController::QLowEnergyController( if (isBluez5DbusGatt()) d_ptr = new QLowEnergyControllerPrivateBluezDBus(); else - d_ptr = new QLowEnergyControllerPrivate(); + d_ptr = new QLowEnergyControllerPrivateCommon(); #else - d_ptr = new QLowEnergyControllerPrivate(); + d_ptr = new QLowEnergyControllerPrivateCommon(); #endif Q_D(QLowEnergyController); @@ -342,9 +342,9 @@ QLowEnergyController::QLowEnergyController( if (isBluez5DbusGatt()) d_ptr = new QLowEnergyControllerPrivateBluezDBus(); else - d_ptr = new QLowEnergyControllerPrivate(); + d_ptr = new QLowEnergyControllerPrivateCommon(); #else - d_ptr = new QLowEnergyControllerPrivate(); + d_ptr = new QLowEnergyControllerPrivateCommon(); #endif Q_D(QLowEnergyController); @@ -382,9 +382,9 @@ QLowEnergyController::QLowEnergyController( if (isBluez5DbusGatt()) d_ptr = new QLowEnergyControllerPrivateBluezDBus(); else - d_ptr = new QLowEnergyControllerPrivate(); + d_ptr = new QLowEnergyControllerPrivateCommon(); #else - d_ptr = new QLowEnergyControllerPrivate(); + d_ptr = new QLowEnergyControllerPrivateCommon(); #endif Q_D(QLowEnergyController); @@ -434,9 +434,9 @@ QLowEnergyController::QLowEnergyController(QObject *parent) if (isBluez5DbusGatt()) d_ptr = new QLowEnergyControllerPrivateBluezDBus(); else - d_ptr = new QLowEnergyControllerPrivate(); + d_ptr = new QLowEnergyControllerPrivateCommon(); #else - d_ptr = new QLowEnergyControllerPrivate(); + d_ptr = new QLowEnergyControllerPrivateCommon(); #endif Q_D(QLowEnergyController); @@ -783,7 +783,7 @@ QLowEnergyService *QLowEnergyController::addService(const QLowEnergyServiceData return newService; } -QLowEnergyService *QLowEnergyControllerPrivate::addServiceHelper( +QLowEnergyService *QLowEnergyControllerPrivateCommon::addServiceHelper( const QLowEnergyServiceData &service) { // Spec says services "should" be grouped by uuid length (16-bit first, then 128-bit). |