summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Klitzing <aklitzing@gmail.com>2017-10-06 10:52:32 (GMT)
committerAndré Klitzing <aklitzing@gmail.com>2017-10-10 14:34:28 (GMT)
commit5775c5e344e94f47af73d0d72a631375fb10d3d5 (patch)
treee18316b976b9960b923bddd0c7c621cb4d59d535
parentb01ffb0f295fbf39771783da84797231f38b976e (diff)
downloadqtwebsockets-5775c5e344e94f47af73d0d72a631375fb10d3d5.tar.gz
Replace Q_ENUMS by Q_ENUM
Change-Id: Ie16c88fb0a215efe5f152ea2d12c984f8d9e0878 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
-rw-r--r--src/imports/qmlwebsockets/qqmlwebsocket.h2
-rw-r--r--src/websockets/qwebsocketserver.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.h b/src/imports/qmlwebsockets/qqmlwebsocket.h
index c3a808f..8db435d 100644
--- a/src/imports/qmlwebsockets/qqmlwebsocket.h
+++ b/src/imports/qmlwebsockets/qqmlwebsocket.h
@@ -54,7 +54,6 @@ class QQmlWebSocket : public QObject, public QQmlParserStatus
Q_DISABLE_COPY(QQmlWebSocket)
Q_INTERFACES(QQmlParserStatus)
- Q_ENUMS(Status)
Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
Q_PROPERTY(Status status READ status NOTIFY statusChanged)
Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged)
@@ -73,6 +72,7 @@ public:
Closed = 3,
Error = 4
};
+ Q_ENUM(Status)
QUrl url() const;
void setUrl(const QUrl &url);
diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h
index f846290..9dc286b 100644
--- a/src/websockets/qwebsocketserver.h
+++ b/src/websockets/qwebsocketserver.h
@@ -65,8 +65,6 @@ class Q_WEBSOCKETS_EXPORT QWebSocketServer : public QObject
Q_DISABLE_COPY(QWebSocketServer)
Q_DECLARE_PRIVATE(QWebSocketServer)
- Q_ENUMS(SslMode)
-
public:
enum SslMode {
#ifndef QT_NO_SSL
@@ -74,6 +72,7 @@ public:
#endif
NonSecureMode = 1
};
+ Q_ENUM(SslMode)
explicit QWebSocketServer(const QString &serverName, SslMode secureMode,
QObject *parent = Q_NULLPTR);