diff options
| author | Richard Moore <rich@kde.org> | 2012-01-28 13:41:20 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 16:39:56 +0100 |
| commit | b3a978d661b7d85b637e8e8a134bd1df925947f8 (patch) | |
| tree | 47dec1d945d71835bee918e7d9c2b128e0c012e7 /src/network/socket | |
| parent | e54dc7c2b5b9aa14989f26a718eb99d7516af4a0 (diff) | |
Make the pause modes a QFlags.
The intention is to add additional pause modes over time, this will
be easier if we can just test if a particular reason for pausing is
turned on. If we don't do this we'll end up having to check for each
enum value every time we check what is enabled.
Change-Id: I6b08f0e819b5593e3f6463c3dd175eff8625e155
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 4 | ||||
| -rw-r--r-- | src/network/socket/qabstractsocket.h | 10 | ||||
| -rw-r--r-- | src/network/socket/qabstractsocket_p.h | 2 |
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; |