diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-05-03 12:37:51 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-05-03 12:37:51 (GMT) |
| commit | f79d343febba4f35bf46fd75e296988b93724890 (patch) | |
| tree | aa97ef1892f35f71c56551ffdd311944ce7e18a5 /src/corelib/io | |
| parent | fbeba14bda563256846459b78b29cb888da695a4 (diff) | |
| parent | 56a0c1d1e2868aa1bba421f16e4f917373f574ff (diff) | |
| download | Qt-f79d343febba4f35bf46fd75e296988b93724890.zip Qt-f79d343febba4f35bf46fd75e296988b93724890.tar.gz Qt-f79d343febba4f35bf46fd75e296988b93724890.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qiodevice.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index f2cef4e1..bb11d6b 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -755,7 +755,6 @@ qint64 QIODevice::bytesToWrite() const qint64 QIODevice::read(char *data, qint64 maxSize) { Q_D(QIODevice); - CHECK_READABLE(read, qint64(-1)); #if defined QIODEVICE_DEBUG printf("%p QIODevice::read(%p, %d), d->pos = %d, d->buffer.size() = %d\n", @@ -786,13 +785,13 @@ qint64 QIODevice::read(char *data, qint64 maxSize) do { // Try reading from the buffer. int lastReadChunkSize = d->buffer.read(data, maxSize); - *d->pPos += lastReadChunkSize; - readSoFar += lastReadChunkSize; - // fast exit when satisfied by buffer - if (lastReadChunkSize == maxSize && !(d->openMode & Text)) - return readSoFar; - if (lastReadChunkSize > 0) { + *d->pPos += lastReadChunkSize; + readSoFar += lastReadChunkSize; + // fast exit when satisfied by buffer + if (lastReadChunkSize == maxSize && !(d->openMode & Text)) + return readSoFar; + data += lastReadChunkSize; maxSize -= lastReadChunkSize; #if defined QIODEVICE_DEBUG |