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

Utils: Inline QtcProcessPrivate::processStd{Out,Err}

Browse Source 
Less indirection.

Change-Id: Iff05c36b20d046a08725ebcb3c03931b6fd8aeab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-06 11:32:40 +02:00
parent cad7671da0
commit 8aafe36d01
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/libs/utils/qtcprocess.cpp
View File

@@ -745,8 +745,6 @@ public:
void slotTimeout(); void slotTimeout();
void slotFinished(int exitCode, QProcess::ExitStatus e); void slotFinished(int exitCode, QProcess::ExitStatus e);
void slotError(QProcess::ProcessError); void slotError(QProcess::ProcessError);
void processStdOut(bool emitSignals);
void processStdErr(bool emitSignals);
void clearForRun(); void clearForRun();
QtcProcess *q; QtcProcess *q;
@@ -2081,11 +2079,11 @@ SynchronousProcess::SynchronousProcess()
connect(this, &QProcess::errorOccurred, d, &QtcProcessPrivate::slotError); connect(this, &QProcess::errorOccurred, d, &QtcProcessPrivate::slotError);
connect(this, &QProcess::readyReadStandardOutput, d, [this] { connect(this, &QProcess::readyReadStandardOutput, d, [this] {
d->m_hangTimerCount = 0; d->m_hangTimerCount = 0;
d->processStdOut(true); d->m_stdOut.append(readAllStandardOutput(), true);
}); });
connect(this, &QProcess::readyReadStandardError, d, [this] { connect(this, &QProcess::readyReadStandardError, d, [this] {
d->m_hangTimerCount = 0; d->m_hangTimerCount = 0;
d->processStdErr(true); d->m_stdErr.append(readAllStandardError(), true);
}); });
} }
@@ -2180,8 +2178,8 @@ SynchronousProcessResponse QtcProcess::run(const CommandLine &cmd, const QByteAr
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
#endif #endif
d->m_eventLoop.exec(QEventLoop::ExcludeUserInputEvents); d->m_eventLoop.exec(QEventLoop::ExcludeUserInputEvents);
d->processStdOut(false); d->m_stdOut.append(readAllStandardOutput(), false);
d->processStdErr(false); d->m_stdErr.append(readAllStandardError(), false);
d->m_result.rawStdOut = d->m_stdOut.rawData; d->m_result.rawStdOut = d->m_stdOut.rawData;
d->m_result.rawStdErr = d->m_stdErr.rawData; d->m_result.rawStdErr = d->m_stdErr.rawData;
@@ -2253,8 +2251,8 @@ SynchronousProcessResponse QtcProcess::runBlocking(const CommandLine &cmd)
else else
d->m_result.result = d->m_exitCodeInterpreter(d->m_result.exitCode); d->m_result.result = d->m_exitCodeInterpreter(d->m_result.exitCode);
} }
d->processStdOut(false); d->m_stdOut.append(readAllStandardOutput(), false);
d->processStdErr(false); d->m_stdErr.append(readAllStandardError(), false);
d->m_result.rawStdOut = d->m_stdOut.rawData; d->m_result.rawStdOut = d->m_stdOut.rawData;
d->m_result.rawStdErr = d->m_stdErr.rawData; d->m_result.rawStdErr = d->m_stdErr.rawData;
@@ -2325,16 +2323,4 @@ void QtcProcessPrivate::slotError(QProcess::ProcessError e)
m_eventLoop.quit(); m_eventLoop.quit();
} }
void QtcProcessPrivate::processStdOut(bool emitSignals)
{
// Handle binary data
m_stdOut.append(q->readAllStandardOutput(), emitSignals);
}
void QtcProcessPrivate::processStdErr(bool emitSignals)
{
// Handle binary data
m_stdErr.append(q->readAllStandardError(), emitSignals);
}
} // namespace Utils } // namespace Utils