feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Vcs: Leave lone CRs alone when normalizing line endings

Browse Source 
Change-Id: I426d850d96fff724c718471a5cab262ce0bf7d05
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2014-03-07 14:23:40 +01:00
committed by Orgad Shaneh
parent 590c033b36
commit 1bda0b3ec1
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libs/utils/synchronousprocess.cpp
View File

@@ -188,7 +188,8 @@ void ChannelBuffer::clearForRun()
QString ChannelBuffer::linesRead() QString ChannelBuffer::linesRead()
{ {
// Any new lines? // Any new lines?
const int lastLineIndex = data.lastIndexOf(QLatin1Char('\n')); const int lastLineIndex = qMax(data.lastIndexOf(QLatin1Char('\n')),
data.lastIndexOf(QLatin1Char('\r')));
if (lastLineIndex == -1 || lastLineIndex <= bufferPos) if (lastLineIndex == -1 || lastLineIndex <= bufferPos)
return QString(); return QString();
const int nextBufferPos = lastLineIndex + 1; const int nextBufferPos = lastLineIndex + 1;
@@ -719,20 +720,8 @@ QString SynchronousProcess::locateBinary(const QString &path, const QString &bin
QString SynchronousProcess::normalizeNewlines(const QString &text) QString SynchronousProcess::normalizeNewlines(const QString &text)
{ {
const QChar cr(QLatin1Char('\r')); QString res = text;
const QChar lf(QLatin1Char('\n')); res.replace(QLatin1String("\r\n"), QLatin1String("\n"));
QString res;
res.reserve(text.size());
for (int i = 0, count = text.size(); i < count; ++i) {
const QChar c = text.at(i);
if (c == cr) {
res += lf;
if (i + 1 < count && text.at(i + 1) == lf)
++i;
} else {
res += c;
}
}
return res; return res;
} }