From 44bb33012809d238138037b3ac9382215c0233aa Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 16 Jun 2022 13:50:03 +0200 Subject: [PATCH] ProjectExplorer: Split RunWorker::appendMessage overloads ... into separate functions. Makes the use of the parameter clearer and is easier to connect too. Change-Id: I061b0b5c847ae1e695afc75332e634ddf2576d6c Reviewed-by: David Schulz --- src/plugins/projectexplorer/runcontrol.cpp | 13 +++++++++---- src/plugins/projectexplorer/runcontrol.h | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp index b826b215698..f8da814b7a6 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/src/plugins/projectexplorer/runcontrol.cpp @@ -1379,7 +1379,7 @@ void SimpleTargetRunnerPrivate::handleStandardOutput() const QByteArray data = m_process.readAllStandardOutput(); const QString msg = m_outputCodec->toUnicode( data.constData(), data.length(), &m_outputCodecState); - q->appendMessage(msg, StdOutFormat, false); + q->appendMessageChunk(msg, StdOutFormat); } void SimpleTargetRunnerPrivate::handleStandardError() @@ -1387,7 +1387,7 @@ void SimpleTargetRunnerPrivate::handleStandardError() const QByteArray data = m_process.readAllStandardError(); const QString msg = m_outputCodec->toUnicode( data.constData(), data.length(), &m_errorCodecState); - q->appendMessage(msg, StdErrFormat, false); + q->appendMessageChunk(msg, StdErrFormat); } void SimpleTargetRunnerPrivate::start() @@ -1766,14 +1766,19 @@ void RunWorker::reportFailure(const QString &msg) * Appends a message in the specified \a format to * the owning RunControl's \uicontrol{Application Output} pane. */ -void RunWorker::appendMessage(const QString &msg, OutputFormat format, bool appendNewLine) +void RunWorker::appendMessage(const QString &msg, OutputFormat format) { - if (!appendNewLine || msg.endsWith('\n')) + if (msg.endsWith('\n')) emit d->runControl->appendMessage(msg, format); else emit d->runControl->appendMessage(msg + '\n', format); } +void RunWorker::appendMessageChunk(const QString &msg, OutputFormat format) +{ + emit d->runControl->appendMessage(msg, format); +} + IDevice::ConstPtr RunWorker::device() const { return d->runControl->device(); diff --git a/src/plugins/projectexplorer/runcontrol.h b/src/plugins/projectexplorer/runcontrol.h index ebb0ec54a0b..0ff9b8778e9 100644 --- a/src/plugins/projectexplorer/runcontrol.h +++ b/src/plugins/projectexplorer/runcontrol.h @@ -92,7 +92,8 @@ public: QVariant recordedData(const QString &channel) const; // Part of read-only interface of RunControl for convenience. - void appendMessage(const QString &msg, Utils::OutputFormat format, bool appendNewLine = true); + void appendMessage(const QString &msg, Utils::OutputFormat format); + void appendMessageChunk(const QString &msg, Utils::OutputFormat format); IDeviceConstPtr device() const; // States