summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2009-06-17 12:22:50 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2009-06-17 12:22:50 (GMT)
commitaff5e7a05e598f8196da4fe39dd0d193426d36e8 (patch)
tree550bfba3ac91db48f54336c2edddb8720a16ca43
parent6f2f1fb334c8fbcaa2bf0607e813628b4c9549ca (diff)
downloadQt-aff5e7a05e598f8196da4fe39dd0d193426d36e8.zip
Qt-aff5e7a05e598f8196da4fe39dd0d193426d36e8.tar.gz
Qt-aff5e7a05e598f8196da4fe39dd0d193426d36e8.tar.bz2
QIoDevice and QAbstractSocket: Clarify doc about waitForReadyRead()
-rw-r--r--src/corelib/io/qiodevice.cpp4
-rw-r--r--src/network/socket/qabstractsocket.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index d3fa6a8..2977c7f 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -1454,11 +1454,11 @@ QByteArray QIODevice::peek(qint64 maxSize)
}
/*!
- Blocks until data is available for reading and the readyRead()
+ Blocks until new data is available for reading and the readyRead()
signal has been emitted, or until \a msecs milliseconds have
passed. If msecs is -1, this function will not time out.
- Returns true if data is available for reading; otherwise returns
+ Returns true if new data is available for reading; otherwise returns
false (if the operation timed out or if an error occurred).
This function can operate without an event loop. It is
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 19bfe51..d099382 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -1658,13 +1658,13 @@ bool QAbstractSocket::waitForConnected(int msecs)
}
/*!
- This function blocks until data is available for reading and the
+ This function blocks until new data is available for reading and the
\l{QIODevice::}{readyRead()} signal has been emitted. The function
will timeout after \a msecs milliseconds; the default timeout is
30000 milliseconds.
The function returns true if the readyRead() signal is emitted and
- there is data available for reading; otherwise it returns false
+ there is new data available for reading; otherwise it returns false
(if an error occurred or the operation timed out).
\sa waitForBytesWritten()