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_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/qlowenergycontroller_p.h')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetooth/qlowenergycontroller_p.h b/src/bluetooth/qlowenergycontroller_p.h index c00a56a0..0cf62ad7 100644 --- a/src/bluetooth/qlowenergycontroller_p.h +++ b/src/bluetooth/qlowenergycontroller_p.h @@ -109,12 +109,12 @@ extern void registerQLowEnergyControllerMetaType(); class QLeAdvertiser; -class QLowEnergyControllerPrivate : public QLowEnergyControllerPrivateBase +class QLowEnergyControllerPrivateCommon : public QLowEnergyControllerPrivate { Q_OBJECT public: - QLowEnergyControllerPrivate(); - ~QLowEnergyControllerPrivate(); + QLowEnergyControllerPrivateCommon(); + ~QLowEnergyControllerPrivateCommon(); void init() override; @@ -451,7 +451,7 @@ private: }; -Q_DECLARE_TYPEINFO(QLowEnergyControllerPrivate::Attribute, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QLowEnergyControllerPrivateCommon::Attribute, Q_MOVABLE_TYPE); QT_END_NAMESPACE |