diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-02 16:20:28 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-06-03 04:27:22 +0000 |
| commit | 21674735ccd029c17dc8b36211e9b5bc3595ba34 (patch) | |
| tree | fa3ebdc8da62854a8072a25e681b7d038332ecc0 /src/corelib/io/qtextstream.h | |
| parent | eea10943492473bae7f048f8c59e35fb1bff36ca (diff) | |
Rename QTextStream::readLine(QString *, qint64) into readLineInto
As discussed on the development mailing list, the new overload is ambiguous
and breaks source compatibility. Therefore this function that is new in 5.5
shall be called readLineInto.
Change-Id: I2aecb8441af4edb72f16d0bc6dabf10cdabf32e2
Reviewed-by: Jan Kundrát <jkt@kde.org>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qtextstream.h')
| -rw-r--r-- | src/corelib/io/qtextstream.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h index 125502e68d..e5f429ae4d 100644 --- a/src/corelib/io/qtextstream.h +++ b/src/corelib/io/qtextstream.h @@ -124,7 +124,7 @@ public: void skipWhiteSpace(); QString readLine(qint64 maxlen = 0); - bool readLine(QString *line, qint64 maxlen = 0); + bool readLineInto(QString *line, qint64 maxlen = 0); QString readAll(); QString read(qint64 maxlen); |