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

ProjectExplorer: Split RunWorker::appendMessage overloads

Browse Source 
... into separate functions. Makes the use of the parameter clearer
and is easier to connect too.

Change-Id: I061b0b5c847ae1e695afc75332e634ddf2576d6c
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2022-06-16 13:50:03 +02:00
parent 425a0c8835
commit 44bb330128
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/runcontrol.cpp
View File

@@ -1379,7 +1379,7 @@ void SimpleTargetRunnerPrivate::handleStandardOutput()
const QByteArray data = m_process.readAllStandardOutput(); const QByteArray data = m_process.readAllStandardOutput();
const QString msg = m_outputCodec->toUnicode( const QString msg = m_outputCodec->toUnicode(
data.constData(), data.length(), &m_outputCodecState); data.constData(), data.length(), &m_outputCodecState);
q->appendMessage(msg, StdOutFormat, false); q->appendMessageChunk(msg, StdOutFormat);
} }
void SimpleTargetRunnerPrivate::handleStandardError() void SimpleTargetRunnerPrivate::handleStandardError()
@@ -1387,7 +1387,7 @@ void SimpleTargetRunnerPrivate::handleStandardError()
const QByteArray data = m_process.readAllStandardError(); const QByteArray data = m_process.readAllStandardError();
const QString msg = m_outputCodec->toUnicode( const QString msg = m_outputCodec->toUnicode(
data.constData(), data.length(), &m_errorCodecState); data.constData(), data.length(), &m_errorCodecState);
q->appendMessage(msg, StdErrFormat, false); q->appendMessageChunk(msg, StdErrFormat);
} }
void SimpleTargetRunnerPrivate::start() void SimpleTargetRunnerPrivate::start()
@@ -1766,14 +1766,19 @@ void RunWorker::reportFailure(const QString &msg)
* Appends a message in the specified \a format to * Appends a message in the specified \a format to
* the owning RunControl's \uicontrol{Application Output} pane. * 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); emit d->runControl->appendMessage(msg, format);
else else
emit d->runControl->appendMessage(msg + '\n', format); 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 IDevice::ConstPtr RunWorker::device() const
{ {
return d->runControl->device(); return d->runControl->device();

3
src/plugins/projectexplorer/runcontrol.h
View File

@@ -92,7 +92,8 @@ public:
QVariant recordedData(const QString &channel) const; QVariant recordedData(const QString &channel) const;
// Part of read-only interface of RunControl for convenience. // 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; IDeviceConstPtr device() const;
// States // States