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

PE: Get rid of ProcessRunner::process()

Browse Source 
Provide stdOutData() signal instead.

Change-Id: Ie89c64c67ea383a9f2265bad3b527d3337342656
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-01-02 15:50:54 +01:00
parent ac5ca391dd
commit 49a66abf1f
3 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/perfprofiler/perfprofilerruncontrol.cpp
View File

@@ -140,18 +140,11 @@ public:
&PerfProfilerTool::onRunControlFinished); &PerfProfilerTool::onRunControlFinished);
PerfDataReader *reader = m_perfParserWorker->reader(); PerfDataReader *reader = m_perfParserWorker->reader();
Process *perfProcess = m_perfRecordWorker->process(); connect(m_perfRecordWorker, &ProcessRunner::stdOutData,
this, [this, reader](const QByteArray &data) {
if (perfProcess) { if (!reader->feedParser(data))
connect(perfProcess, &Process::readyReadStandardError, this, [this, perfProcess] {
appendMessage(QString::fromLocal8Bit(perfProcess->readAllRawStandardError()),
StdErrFormat);
});
connect(perfProcess, &Process::readyReadStandardOutput, this, [this, reader, perfProcess] {
if (!reader->feedParser(perfProcess->readAllRawStandardOutput()))
reportFailure(Tr::tr("Failed to transfer Perf data to perfparser.")); reportFailure(Tr::tr("Failed to transfer Perf data to perfparser."));
}); });
}
reportStarted(); reportStarted();
} }

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

@@ -1512,17 +1512,13 @@ void ProcessRunnerPrivate::handleDone()
void ProcessRunnerPrivate::handleStandardOutput() void ProcessRunnerPrivate::handleStandardOutput()
{ {
if (m_suppressDefaultStdOutHandling) if (m_suppressDefaultStdOutHandling)
return; emit q->stdOutData(m_process.readAllRawStandardOutput());
else
const QString msg = m_process.readAllStandardOutput(); q->appendMessage(m_process.readAllStandardOutput(), StdOutFormat, false);
q->appendMessage(msg, StdOutFormat, false);
} }
void ProcessRunnerPrivate::handleStandardError() void ProcessRunnerPrivate::handleStandardError()
{ {
if (m_suppressDefaultStdOutHandling)
return;
const QString msg = m_process.readAllStandardError(); const QString msg = m_process.readAllStandardError();
q->appendMessage(msg, StdErrFormat, false); q->appendMessage(msg, StdErrFormat, false);
} }
@@ -1709,11 +1705,6 @@ void ProcessRunner::setProcessMode(Utils::ProcessMode processMode)
d->m_process.setProcessMode(processMode); d->m_process.setProcessMode(processMode);
} }
Process *ProcessRunner::process() const
{
return &d->m_process;
}
void ProcessRunner::suppressDefaultStdOutHandling() void ProcessRunner::suppressDefaultStdOutHandling()
{ {
d->m_suppressDefaultStdOutHandling = true; d->m_suppressDefaultStdOutHandling = true;

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

@@ -293,11 +293,13 @@ public:
void setEnvironment(const Utils::Environment &environment); void setEnvironment(const Utils::Environment &environment);
void setWorkingDirectory(const Utils::FilePath &workingDirectory); void setWorkingDirectory(const Utils::FilePath &workingDirectory);
void setProcessMode(Utils::ProcessMode processMode); void setProcessMode(Utils::ProcessMode processMode);
Utils::Process *process() const;
void suppressDefaultStdOutHandling(); void suppressDefaultStdOutHandling();
void forceRunOnHost(); void forceRunOnHost();
signals:
void stdOutData(const QByteArray &data);
private: private:
void start() final; void start() final;
void stop() final; void stop() final;