summaryrefslogtreecommitdiffstats
path: root/src/network/socket
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2009-08-18 08:32:04 (GMT)
committerShane Kearns <shane.kearns@sosco.com>2009-08-18 08:32:04 (GMT)
commit06524f769fec76fa7ebcc39ac88ac9e08c720677 (patch)
treea14448b17d6a8e1104d8471bee0948de4572df84 /src/network/socket
parent1428cc6d71a65c1ac7123c9c4cc3cfaf225cceed (diff)
parentff96a87389d69a537a91d364b299aae09c2129a6 (diff)
downloadQt-06524f769fec76fa7ebcc39ac88ac9e08c720677.zip
Qt-06524f769fec76fa7ebcc39ac88ac9e08c720677.tar.gz
Qt-06524f769fec76fa7ebcc39ac88ac9e08c720677.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/network/socket')
-rw-r--r--src/network/socket/qabstractsocket.cpp2
-rw-r--r--src/network/socket/qnativesocketengine.cpp2
-rw-r--r--src/network/socket/qtcpserver.cpp2
-rw-r--r--src/network/socket/qtcpsocket.cpp2
-rw-r--r--src/network/socket/qudpsocket.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 9b50840..c38152a 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -48,7 +48,7 @@
common to all socket types.
\reentrant
- \ingroup io
+ \ingroup network
\inmodule QtNetwork
QAbstractSocket is the base class for QTcpSocket and QUdpSocket
diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp
index a2f88d7..f8e27e9 100644
--- a/src/network/socket/qnativesocketengine.cpp
+++ b/src/network/socket/qnativesocketengine.cpp
@@ -47,7 +47,7 @@
\brief The QNativeSocketEngine class provides low level access to a socket.
\reentrant
- \ingroup io
+ \ingroup network
\inmodule QtNetwork
QtSocketLayer provides basic socket functionality provided by the
diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp
index 26e3c24..b13a50b 100644
--- a/src/network/socket/qtcpserver.cpp
+++ b/src/network/socket/qtcpserver.cpp
@@ -46,7 +46,7 @@
\brief The QTcpServer class provides a TCP-based server.
\reentrant
- \ingroup io
+ \ingroup network
\inmodule QtNetwork
This class makes it possible to accept incoming TCP connections.
diff --git a/src/network/socket/qtcpsocket.cpp b/src/network/socket/qtcpsocket.cpp
index af1cee7..604143a 100644
--- a/src/network/socket/qtcpsocket.cpp
+++ b/src/network/socket/qtcpsocket.cpp
@@ -47,7 +47,7 @@
\brief The QTcpSocket class provides a TCP socket.
\reentrant
- \ingroup io
+ \ingroup network
\inmodule QtNetwork
TCP (Transmission Control Protocol) is a reliable,
diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp
index be86f44..5483ece 100644
--- a/src/network/socket/qudpsocket.cpp
+++ b/src/network/socket/qudpsocket.cpp
@@ -46,7 +46,7 @@
\reentrant
\brief The QUdpSocket class provides a UDP socket.
- \ingroup io
+ \ingroup network
\inmodule QtNetwork
UDP (User Datagram Protocol) is a lightweight, unreliable,