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/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.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/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h')
| -rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h index 82a2129b..a06d49c4 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h @@ -64,8 +64,6 @@ class QDeclarativeBluetoothDiscoveryModelPrivate; class QDeclarativeBluetoothDiscoveryModel : public QAbstractListModel, public QQmlParserStatus { Q_OBJECT - Q_ENUMS(DiscoveryMode) - Q_ENUMS(Error) Q_PROPERTY(Error error READ error NOTIFY errorChanged) Q_PROPERTY(DiscoveryMode discoveryMode READ discoveryMode WRITE setDiscoveryMode NOTIFY discoveryModeChanged) Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged) @@ -88,6 +86,7 @@ public: FullServiceDiscovery, DeviceDiscovery }; + Q_ENUM(DiscoveryMode) enum Error { @@ -97,6 +96,7 @@ public: UnknownError, InvalidBluetoothAdapterError }; + Q_ENUM(Error) Error error() const; |