diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 16:20:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-27 13:54:35 +0200 |
| commit | 4dd8a63fc13cee365c58ef67fa4a4503aeceebe8 (patch) | |
| tree | c34de00e0bceeb70ed006e06a7fefc21537c72a1 /src/corelib/io/qtextstream.cpp | |
| parent | 5757b8c516ad0d613739b222687583bca914a981 (diff) | |
| parent | fae33bfbe35f8d082b420ee09662ff60634cb355 (diff) | |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Conflicts:
src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
Manually fixed src/testlib/qtestcase.cpp to return the right type.
Change-Id: Id1634dbe3d73fefe9431b9f5378846cb187624e4
Diffstat (limited to 'src/corelib/io/qtextstream.cpp')
| -rw-r--r-- | src/corelib/io/qtextstream.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp index 47b96d708f8..8ad1c2852cc 100644 --- a/src/corelib/io/qtextstream.cpp +++ b/src/corelib/io/qtextstream.cpp @@ -1591,7 +1591,7 @@ QString QTextStream::readLine(qint64 maxlen) { QString line; - readLine(&line, maxlen); + readLineInto(&line, maxlen); return line; } @@ -1612,7 +1612,7 @@ QString QTextStream::readLine(qint64 maxlen) If \a line has sufficient capacity for the data that is about to be read, this function may not need to allocate new memory. Because of - this, it can be faster than the other readLine() overload. + this, it can be faster than readLine(). Returns \c false if the stream has read to the end of the file or an error has occurred; otherwise returns \c true. The contents in @@ -1620,7 +1620,7 @@ QString QTextStream::readLine(qint64 maxlen) \sa readAll(), QIODevice::readLine() */ -bool QTextStream::readLine(QString *line, qint64 maxlen) +bool QTextStream::readLineInto(QString *line, qint64 maxlen) { Q_D(QTextStream); // keep in sync with CHECK_VALID_STREAM |