forked from qt-creator/qt-creator
Utils: Rename QtcProcess -> Process
Task-number: QTCREATORBUG-29102 Change-Id: Ibc264f9db6a32206e4097766ee3f7d0b35225a5c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -76,7 +76,7 @@ public:
|
||||
void cleanUp(int exitCode, QProcess::ExitStatus status);
|
||||
|
||||
AbstractProcessStep *q;
|
||||
std::unique_ptr<QtcProcess> m_process;
|
||||
std::unique_ptr<Process> m_process;
|
||||
std::unique_ptr<TaskTree> m_taskTree;
|
||||
ProcessParameters m_param;
|
||||
ProcessParameters *m_displayedParams = &m_param;
|
||||
@@ -182,9 +182,9 @@ void AbstractProcessStep::doRun()
|
||||
|
||||
setupStreams();
|
||||
|
||||
d->m_process.reset(new QtcProcess);
|
||||
d->m_process.reset(new Process);
|
||||
setupProcess(d->m_process.get());
|
||||
connect(d->m_process.get(), &QtcProcess::done, this, &AbstractProcessStep::handleProcessDone);
|
||||
connect(d->m_process.get(), &Process::done, this, &AbstractProcessStep::handleProcessDone);
|
||||
d->m_process->start();
|
||||
}
|
||||
|
||||
@@ -209,7 +209,7 @@ void AbstractProcessStep::setupStreams()
|
||||
d->stderrStream = std::make_unique<QTextDecoder>(QTextCodec::codecForLocale());
|
||||
}
|
||||
|
||||
void AbstractProcessStep::setupProcess(QtcProcess *process)
|
||||
void AbstractProcessStep::setupProcess(Process *process)
|
||||
{
|
||||
process->setUseCtrlCStub(HostOsInfo::isWindowsHost());
|
||||
process->setWorkingDirectory(d->m_param.effectiveWorkingDirectory());
|
||||
@@ -224,15 +224,15 @@ void AbstractProcessStep::setupProcess(QtcProcess *process)
|
||||
if (d->m_lowPriority && ProjectExplorerPlugin::projectExplorerSettings().lowBuildPriority)
|
||||
process->setLowPriority();
|
||||
|
||||
connect(process, &QtcProcess::readyReadStandardOutput, this, [this, process] {
|
||||
connect(process, &Process::readyReadStandardOutput, this, [this, process] {
|
||||
emit addOutput(d->stdoutStream->toUnicode(process->readAllRawStandardOutput()),
|
||||
OutputFormat::Stdout, DontAppendNewline);
|
||||
});
|
||||
connect(process, &QtcProcess::readyReadStandardError, this, [this, process] {
|
||||
connect(process, &Process::readyReadStandardError, this, [this, process] {
|
||||
emit addOutput(d->stderrStream->toUnicode(process->readAllRawStandardError()),
|
||||
OutputFormat::Stderr, DontAppendNewline);
|
||||
});
|
||||
connect(process, &QtcProcess::started, this, [this] {
|
||||
connect(process, &Process::started, this, [this] {
|
||||
ProcessParameters *params = displayedParameters();
|
||||
emit addOutput(Tr::tr("Starting: \"%1\" %2")
|
||||
.arg(params->effectiveCommand().toUserOutput(), params->prettyArguments()),
|
||||
|
||||
Reference in New Issue
Block a user