From b72fa1f3594ff33a87b26b62ea8d425646bf0907 Mon Sep 17 00:00:00 2001 From: Lorenz Haas Date: Thu, 23 Feb 2017 22:52:38 +0100 Subject: [PATCH] Beautifier: Simplify small code fragment Change-Id: I906d7803ccc6856b09fc25fdea7c7c3d112f4e77 Reviewed-by: David Schulz --- src/plugins/beautifier/beautifierplugin.cpp | 22 +++++++++------------ 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index 213b4290499..ad052020f5f 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -148,20 +148,16 @@ FormatTask format(FormatTask task) return task; } - const bool addsNewline = task.command.pipeAddsNewline(); - const bool returnsCRLF = task.command.returnsCRLF(); - if (addsNewline || returnsCRLF) { - task.formattedData = QString::fromUtf8(process.readAllStandardOutput()); - if (addsNewline && task.formattedData.endsWith('\n')) { - task.formattedData.chop(1); - if (task.formattedData.endsWith('\r')) - task.formattedData.chop(1); - } - if (returnsCRLF) - task.formattedData.replace("\r\n", "\n"); - return task; - } task.formattedData = QString::fromUtf8(process.readAllStandardOutput()); + + if (task.command.pipeAddsNewline() && task.formattedData.endsWith('\n')) { + task.formattedData.chop(1); + if (task.formattedData.endsWith('\r')) + task.formattedData.chop(1); + } + if (task.command.returnsCRLF()) + task.formattedData.replace("\r\n", "\n"); + return task; } }