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

Utils: Rename QtcProcess::readAllStandard* to readAllRawStandard*

Browse Source 
... and re-use the old QtcProcess::readAllStandard* names for
a QString-returning 'decoded' version.

For now, only use that in 'full Utf8' cases, to stay bug-compatible,
the plan is, however, to employ the QTextCodecs we have already
in the channel buffers. That will be one-by-one, though.

Change-Id: Id209e0671920d4ea4197918e872f441254112d52
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2023-01-05 17:55:04 +01:00
parent f08b5727dc
commit 4ddd28ae22
69 changed files with 147 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/texteditor/formattexteditor.cpp
View File

@@ -103,14 +103,13 @@ static FormatTask format(FormatTask task)
.arg(executable, task.filePath.displayName());
return task;
}
const QByteArray errorText = process.readAllStandardError();
const QString errorText = process.readAllStandardError();
if (!errorText.isEmpty()) {
task.error = QString::fromLatin1("%1: %2").arg(executable,
QString::fromUtf8(errorText));
task.error = QString::fromLatin1("%1: %2").arg(executable, errorText);
return task;
}
task.formattedData = QString::fromUtf8(process.readAllStandardOutput());
task.formattedData = process.readAllStandardOutput();
if (task.command.pipeAddsNewline() && task.formattedData.endsWith('\n')) {
task.formattedData.chop(1);