diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-05-27 09:21:08 +0400 |
---|---|---|
committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-06-23 08:22:31 +0000 |
commit | acaab9e6425726d7a3901e6224c6e59874bc5a62 (patch) | |
tree | 443521d372c2be777626000d26d52e834a661838 /src/bluetooth/qlowenergycontroller.h | |
parent | 3acd1a5d4fc4dc501d8b0a149909511e91aafb05 (diff) |
Port from Q_ENUMS to new macro Q_ENUM
Remove Q_ENUMS in favor of the new Q_ENUM macro which provides
registration as meta enum and a debug stream operator.
Register some enums via Q_ENUM to improve debug output
and types auto-registration.
Change-Id: I31c9535a2de7da1783b4ec967612c02a57cb62ff
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/bluetooth/qlowenergycontroller.h')
-rw-r--r-- | src/bluetooth/qlowenergycontroller.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bluetooth/qlowenergycontroller.h b/src/bluetooth/qlowenergycontroller.h index c5a4acd3..fd230238 100644 --- a/src/bluetooth/qlowenergycontroller.h +++ b/src/bluetooth/qlowenergycontroller.h @@ -55,6 +55,7 @@ public: InvalidBluetoothAdapterError, ConnectionError }; + Q_ENUM(Error) enum ControllerState { UnconnectedState = 0, @@ -64,11 +65,13 @@ public: DiscoveredState, ClosingState }; + Q_ENUM(ControllerState) enum RemoteAddressType { PublicAddress = 0, RandomAddress }; + Q_ENUM(RemoteAddressType) explicit QLowEnergyController(const QBluetoothAddress &remoteDevice, QObject *parent = 0); // TODO Qt 6 remove ctor @@ -116,7 +119,4 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QLowEnergyController::ControllerState) -Q_DECLARE_METATYPE(QLowEnergyController::Error) - #endif // QLOWENERGYCONTROLLER_H |