diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-04-30 19:14:06 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 03:11:17 +0200 |
| commit | bb234e238c777b1a708912765d6899bf9061bcb8 (patch) | |
| tree | f24059635af2e1ce223b6931cec5990bf6035c0d /src/network/socket/qabstractsocket.cpp | |
| parent | 42d4639fd95b098ff087afa9fc325adf906e2f55 (diff) | |
Rename QAbstractSocket::PauseOnNotify -> PauseOnSslErrors
Although we created an enum for pause modes to make 5.x binary
compatible with 5.0, the enum value is not well named.
In 5.1, we propose to add PauseOnProxyAuthentication to the enum.
PauseOnNotify is not clear what it means, while PauseOnSslErrors is.
Any new notification in a minor release would need a new enum value
otherwise applications would get pauses they did not expect.
Task-number: QTBUG-19032
Change-Id: I4dbb7467663b37ca7f0551d24a31bc013968bedc
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/network/socket/qabstractsocket.cpp')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 0c4eed8de9..a6eb3626a0 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -434,12 +434,12 @@ This enum describes the behavior of when the socket should hold back with continuing data transfer. + The only notification currently supported is QSslSocket::sslErrors(). \value PauseNever Do not pause data transfer on the socket. This is the default and matches the behaviour of Qt 4. - \value PauseOnNotify Pause data transfer on the socket upon receiving a - notification. The only notification currently supported is - QSslSocket::sslErrors(). + \value PauseOnSslErrors Pause data transfer on the socket upon receiving an + SSL error notification. I.E. QSslSocket::sslErrors(). */ #include "qabstractsocket.h" @@ -1404,7 +1404,7 @@ QAbstractSocket::PauseModes QAbstractSocket::pauseMode() const \since 5.0 Controls whether to pause upon receiving a notification. The only notification - currently supported is QSslSocket::sslErrors(). If set to PauseOnNotify, + currently supported is QSslSocket::sslErrors(). If set to PauseOnSslErrors, data transfer on the socket will be paused and needs to be enabled explicitly again by calling resume(). By default this option is set to PauseNever. |