summaryrefslogtreecommitdiffstats
path: root/src/network/socket
diff options
context:
space:
mode:
authorRichard Moore <rich@kde.org>2012-05-06 18:03:02 +0100
committerQt by Nokia <qt-info@nokia.com>2012-05-06 19:12:43 +0200
commiteee3798f6f69b99dbe0c6a95ca0a4011a8776c19 (patch)
treec3981e92851c3c8ce9634eac024f7fe2a8a3dc58 /src/network/socket
parent54d9fd61e13f7369c831ab76503f7619d60c0cfd (diff)
Fix more qdoc warnings in qtnetwork.
Change-Id: Ibfac6236e9f68b41e34e67ef03cfd590582439be Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/network/socket')
-rw-r--r--src/network/socket/qabstractsocket.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index a6eb3626a0..9d95d3a70e 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -252,6 +252,7 @@
\value IPv4Protocol IPv4
\value IPv6Protocol IPv6
+ \value AnyIPProtocol Either IPv4 or IPv6
\value UnknownNetworkLayerProtocol Other than IPv4 and IPv6
\sa QHostAddress::protocol()
@@ -339,12 +340,6 @@
\value ClosingState The socket is about to close (data may still
be waiting to be written).
\value ListeningState For internal use only.
- \omitvalue Idle
- \omitvalue HostLookup
- \omitvalue Connecting
- \omitvalue Connected
- \omitvalue Closing
- \omitvalue Connection
\sa QAbstractSocket::state()
*/
@@ -1403,7 +1398,8 @@ QAbstractSocket::PauseModes QAbstractSocket::pauseMode() const
/*!
\since 5.0
- Controls whether to pause upon receiving a notification. The only notification
+ Controls whether to pause upon receiving a notification. The \pauseMode parameter
+ specifies the conditions in which the socket should be paused. The only notification
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().
@@ -1524,6 +1520,8 @@ bool QAbstractSocket::isValid() const
/*!
Attempts to make a connection to \a hostName on the given \a port.
+ The \a protocol parameter can be used to specify which network
+ protocol to use (eg. IPv4 or IPv6).
The socket is opened in the given \a openMode and first enters
HostLookupState, then performs a host name lookup of \a hostName.