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/qbluetoothlocaldevice.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/qbluetoothlocaldevice.h')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h index bcb39bda..4587bbf0 100644 --- a/src/bluetooth/qbluetoothlocaldevice.h +++ b/src/bluetooth/qbluetoothlocaldevice.h @@ -49,15 +49,14 @@ class QBluetoothLocalDevicePrivate; class Q_BLUETOOTH_EXPORT QBluetoothLocalDevice : public QObject { Q_OBJECT - Q_ENUMS(Pairing) - Q_ENUMS(HostMode) - Q_ENUMS(Error) + public: enum Pairing { Unpaired, Paired, AuthorizedPaired }; + Q_ENUM(Pairing) enum HostMode { HostPoweredOff, @@ -65,12 +64,15 @@ public: HostDiscoverable, HostDiscoverableLimitedInquiry }; + Q_ENUM(HostMode) enum Error { NoError, PairingError, UnknownError = 100 }; + Q_ENUM(Error) + QBluetoothLocalDevice(QObject *parent = 0); explicit QBluetoothLocalDevice(const QBluetoothAddress &address, QObject *parent = 0); virtual ~QBluetoothLocalDevice(); @@ -111,8 +113,4 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QBluetoothLocalDevice::HostMode) -Q_DECLARE_METATYPE(QBluetoothLocalDevice::Pairing) -Q_DECLARE_METATYPE(QBluetoothLocalDevice::Error) - #endif // QBLUETOOTHLOCALDEVICE_H |