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

Beautifier: Simplify small code fragment

Browse Source 
Change-Id: I906d7803ccc6856b09fc25fdea7c7c3d112f4e77
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Lorenz Haas
2017-02-23 22:52:38 +01:00
parent 0264053d9b
commit b72fa1f359
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/beautifier/beautifierplugin.cpp
View File

@@ -148,20 +148,16 @@ FormatTask format(FormatTask task)
return task; return task;
} }
const bool addsNewline = task.command.pipeAddsNewline();
const bool returnsCRLF = task.command.returnsCRLF();
if (addsNewline || returnsCRLF) {
task.formattedData = QString::fromUtf8(process.readAllStandardOutput()); task.formattedData = QString::fromUtf8(process.readAllStandardOutput());
if (addsNewline && task.formattedData.endsWith('\n')) {
if (task.command.pipeAddsNewline() && task.formattedData.endsWith('\n')) {
task.formattedData.chop(1); task.formattedData.chop(1);
if (task.formattedData.endsWith('\r')) if (task.formattedData.endsWith('\r'))
task.formattedData.chop(1); task.formattedData.chop(1);
} }
if (returnsCRLF) if (task.command.returnsCRLF())
task.formattedData.replace("\r\n", "\n"); task.formattedData.replace("\r\n", "\n");
return task;
}
task.formattedData = QString::fromUtf8(process.readAllStandardOutput());
return task; return task;
} }
} }