From ba7cedb058455942dda337223a170b4f9566f0ef Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Sat, 7 Feb 2015 13:01:06 +0100
Subject: QtNetwork: use Q_ENUM instead of Q_ENUMS

Change-Id: I531191fae910354abd2e5ceb7c8ecf0519ccad97
Reviewed-by: Peter Hartmann <peter-qt@hartmann.tk>
---
 src/network/socket/qabstractsocket.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/network/socket/qabstractsocket.h')

diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h
index fa4e7c9a28..77a6f59624 100644
--- a/src/network/socket/qabstractsocket.h
+++ b/src/network/socket/qabstractsocket.h
@@ -53,19 +53,20 @@ class QAuthenticator;
 class Q_NETWORK_EXPORT QAbstractSocket : public QIODevice
 {
     Q_OBJECT
-    Q_ENUMS(SocketType NetworkLayerProtocol SocketError SocketState SocketOption)
 public:
     enum SocketType {
         TcpSocket,
         UdpSocket,
         UnknownSocketType = -1
     };
+    Q_ENUM(SocketType)
     enum NetworkLayerProtocol {
         IPv4Protocol,
         IPv6Protocol,
         AnyIPProtocol,
         UnknownNetworkLayerProtocol = -1
     };
+    Q_ENUM(NetworkLayerProtocol)
     enum SocketError {
         ConnectionRefusedError,
         RemoteHostClosedError,
@@ -93,6 +94,7 @@ public:
 
         UnknownSocketError = -1
     };
+    Q_ENUM(SocketError)
     enum SocketState {
         UnconnectedState,
         HostLookupState,
@@ -102,6 +104,7 @@ public:
         ListeningState,
         ClosingState
     };
+    Q_ENUM(SocketState)
     enum SocketOption {
         LowDelayOption, // TCP_NODELAY
         KeepAliveOption, // SO_KEEPALIVE
@@ -111,6 +114,7 @@ public:
         SendBufferSizeSocketOption,    //SO_SNDBUF
         ReceiveBufferSizeSocketOption  //SO_RCVBUF
     };
+    Q_ENUM(SocketOption)
     enum BindFlag {
         DefaultForPlatform = 0x0,
         ShareAddress = 0x1,
-- 
cgit v1.2.3