From 0b2565a3e76e7798cb5df6327114d6a09dafddd5 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 12 Jul 2023 15:59:24 +0200 Subject: [PATCH] AbstractProcessStep: Get rid of done hook Not needed anymore. Remove emitting 100% progress on finish of CMakeInstallStep, as that's done automatically by the task tree. Task-number: QTCREATORBUG-29168 Change-Id: If93d989eeb0a551f00754c5d6ef7f180fdbabdd5 Reviewed-by: hjk --- src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp | 1 - src/plugins/projectexplorer/abstractprocessstep.cpp | 8 -------- src/plugins/projectexplorer/abstractprocessstep.h | 1 - 3 files changed, 10 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp b/src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp index 63ed8a8bfda..d849a80a363 100644 --- a/src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp @@ -38,7 +38,6 @@ public: cmakeArguments.setDisplayStyle(StringAspect::LineEditDisplay); setCommandLineProvider([this] { return cmakeCommand(); }); - setDoneHook([this](bool) { emit progress(100, {}); }); } private: diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index 56260a4854e..00c345bd5da 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -82,7 +82,6 @@ public: std::function m_commandLineProvider; std::function m_workingDirectoryProvider; std::function m_environmentModifier; - std::function m_doneHook; // TODO: Remove me when all subclasses moved to Tasking bool m_ignoreReturnValue = false; bool m_lowPriority = false; std::unique_ptr stdoutStream; @@ -132,11 +131,6 @@ void AbstractProcessStep::setUseEnglishOutput() d->m_environmentModifier = [](Environment &env) { env.setupEnglishOutput(); }; } -void AbstractProcessStep::setDoneHook(const std::function &doneHook) -{ - d->m_doneHook = doneHook; -} - void AbstractProcessStep::setCommandLineProvider(const std::function &provider) { d->m_commandLineProvider = provider; @@ -362,8 +356,6 @@ void AbstractProcessStep::finish(ProcessResult result) { const bool success = result == ProcessResult::FinishedWithSuccess || (result == ProcessResult::FinishedWithError && d->m_ignoreReturnValue); - if (d->m_doneHook) - d->m_doneHook(success); emit finished(success); } diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h index 9c2618819c3..899440ce27d 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.h +++ b/src/plugins/projectexplorer/abstractprocessstep.h @@ -36,7 +36,6 @@ protected: bool setupProcessParameters(ProcessParameters *params) const; bool ignoreReturnValue() const; void setIgnoreReturnValue(bool b); - void setDoneHook(const std::function &doneHook); void setCommandLineProvider(const std::function &provider); void setWorkingDirectoryProvider(const std::function &provider); void setEnvironmentModifier(const std::function &modifier);