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

AbstractProcessStep: Merge finish() with processFinished()

Browse Source 
Change-Id: Ied15ec3ee9d3bcc80b03b2589d101c65f2fd062a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-12-02 17:37:10 +01:00
parent 6832200313
commit ea35ed9ffe
12 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -174,7 +174,7 @@ void AbstractProcessStep::doRun()
if (!wd.createDir()) {
emit addOutput(tr("Could not create directory \"%1\"").arg(wd.toUserOutput()),
OutputFormat::ErrorMessage);
finish(false);
finish(ProcessResult::StartFailed);
return;
}
}
@@ -290,23 +290,12 @@ void AbstractProcessStep::Private::cleanUp(int exitCode, QProcess::ExitStatus st
OutputFormat::ErrorMessage);
}
const bool success = exitCode == 0 && status == QProcess::NormalExit
&& !outputFormatter->hasFatalErrors();
q->processFinished(success);
if (m_process)
m_process.release()->deleteLater();
q->finish(success || m_ignoreReturnValue);
}
/*!
Called after the process is finished.
The default implementation adds a line to the output window.
*/
void AbstractProcessStep::processFinished(bool success)
{
Q_UNUSED(success)
const ProcessResult result = (status == QProcess::NormalExit && exitCode == 0
&& !outputFormatter->hasFatalErrors())
? ProcessResult::FinishedWithSuccess : ProcessResult::FinishedWithError;
q->finish(result);
}
/*!
@@ -325,12 +314,18 @@ void AbstractProcessStep::processStartupFailed()
QString err = d->m_process ? d->m_process->errorString() : QString();
if (!err.isEmpty())
emit addOutput(err, OutputFormat::ErrorMessage);
finish(false);
finish(ProcessResult::StartFailed);
}
void AbstractProcessStep::finish(bool success)
bool AbstractProcessStep::isSuccess(ProcessResult result) const
{
emit finished(success);
return result == ProcessResult::FinishedWithSuccess
|| (result == ProcessResult::FinishedWithError && d->m_ignoreReturnValue);
}
void AbstractProcessStep::finish(ProcessResult result)
{
emit finished(isSuccess(result));
}
void AbstractProcessStep::handleProcessDone()