summaryrefslogtreecommitdiffstats
path: root/src/network/socket
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/socket')
-rw-r--r--src/network/socket/qabstractsocket.cpp4
-rw-r--r--src/network/socket/qabstractsocket.h10
-rw-r--r--src/network/socket/qabstractsocket_p.h2
3 files changed, 9 insertions, 7 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 52b4c0d7a5..6264ee4c21 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -1390,7 +1390,7 @@ void QAbstractSocket::resume()
\sa setPauseMode(), resume()
*/
-QAbstractSocket::PauseMode QAbstractSocket::pauseMode() const
+QAbstractSocket::PauseModes QAbstractSocket::pauseMode() const
{
return d_func()->pauseMode;
}
@@ -1409,7 +1409,7 @@ QAbstractSocket::PauseMode QAbstractSocket::pauseMode() const
\sa pauseMode(), resume()
*/
-void QAbstractSocket::setPauseMode(PauseMode pauseMode)
+void QAbstractSocket::setPauseMode(PauseModes pauseMode)
{
d_func()->pauseMode = pauseMode;
}
diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h
index c9270faf6c..8d6a7a371a 100644
--- a/src/network/socket/qabstractsocket.h
+++ b/src/network/socket/qabstractsocket.h
@@ -124,16 +124,17 @@ public:
};
Q_DECLARE_FLAGS(BindMode, BindFlag)
enum PauseMode {
- PauseNever,
- PauseOnNotify
+ PauseNever = 0x0,
+ PauseOnNotify = 0x1
};
+ Q_DECLARE_FLAGS(PauseModes, PauseMode)
QAbstractSocket(SocketType socketType, QObject *parent);
virtual ~QAbstractSocket();
virtual void resume(); // to continue after proxy authentication required, SSL errors etc.
- PauseMode pauseMode() const;
- void setPauseMode(PauseMode pauseMode);
+ PauseModes pauseMode() const;
+ void setPauseMode(PauseModes pauseMode);
bool bind(const QHostAddress &address, quint16 port = 0, BindMode mode = DefaultForPlatform);
bool bind(quint16 port = 0, BindMode mode = DefaultForPlatform);
@@ -226,6 +227,7 @@ private:
Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractSocket::BindMode)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractSocket::PauseModes)
#ifndef QT_NO_DEBUG_STREAM
Q_NETWORK_EXPORT QDebug operator<<(QDebug, QAbstractSocket::SocketError);
diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h
index 703a2a4a96..578213f6de 100644
--- a/src/network/socket/qabstractsocket_p.h
+++ b/src/network/socket/qabstractsocket_p.h
@@ -106,7 +106,7 @@ public:
bool closeCalled;
bool pendingClose;
- QAbstractSocket::PauseMode pauseMode;
+ QAbstractSocket::PauseModes pauseMode;
QString hostName;
quint16 port;