TaskTree: Prepare for OnGroup... -> onGroup... renaming

Change-Id: I52b695999b53b80fb8dbb77895080f6c1b86a58f
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>

src/libs/solutions/tasking/tasktree.cpp

@@ -976,11 +976,11 @@ void TaskNode::invokeEndHandler(bool success)
     tasks. The group handler doesn't take any arguments:
 
     \code
-        const auto onGroupSetup = [] {
+        const auto onSetup = [] {
             qDebug() << "Entering the group";
         };
         const Group root {
-            OnGroupSetup(onGroupSetup),
+            OnGroupSetup(onSetup),
             ProcessTask(...)
         };
     \endcode

src/plugins/autotest/testrunner.cpp

@@ -353,7 +353,7 @@ void TestRunner::runTestsHelper()
         QTC_ASSERT(config, continue);
         const TreeStorage<TestStorage> storage;
 
-        const auto onGroupSetup = [this, config] {
+        const auto onSetup = [this, config] {
             if (!config->project())
                 return TaskAction::StopWithDone;
             if (config->testExecutable().isEmpty()) {
@@ -363,7 +363,7 @@ void TestRunner::runTestsHelper()
             }
             return TaskAction::Continue;
         };
-        const auto onSetup = [this, config, storage](Process &process) {
+        const auto onProcessSetup = [this, config, storage](Process &process) {
             TestStorage *testStorage = storage.activeStorage();
             QTC_ASSERT(testStorage, return);
             testStorage->m_outputReader.reset(config->createOutputReader(&process));
@@ -410,7 +410,7 @@ void TestRunner::runTestsHelper()
             qCInfo(runnerLog) << "Working directory:" << process.workingDirectory();
             qCDebug(runnerLog) << "Environment:" << process.environment().toStringList();
         };
-        const auto onDone = [this, config, storage](const Process &process) {
+        const auto onProcessDone = [this, config, storage](const Process &process) {
             TestStorage *testStorage = storage.activeStorage();
             QTC_ASSERT(testStorage, return);
             if (process.result() == ProcessResult::StartFailed) {
@@ -444,8 +444,8 @@ void TestRunner::runTestsHelper()
         const Group group {
             optional,
             Storage(storage),
-            OnGroupSetup(onGroupSetup),
-            ProcessTask(onSetup, onDone, onDone)
+            OnGroupSetup(onSetup),
+            ProcessTask(onProcessSetup, onProcessDone, onProcessDone)
         };
         tasks.append(group);
     }

src/plugins/clangtools/clangtoolrunner.cpp

@@ -121,7 +121,7 @@ TaskItem clangToolTask(const AnalyzeInputData &input,
         return result;
     };
 
-    const auto onGroupSetup = [=] {
+    const auto onSetup = [=] {
         if (setupHandler && !setupHandler())
             return TaskAction::StopWithError;
 
@@ -184,7 +184,7 @@ TaskItem clangToolTask(const AnalyzeInputData &input,
 
     const Group group {
         Storage(storage),
-        OnGroupSetup(onGroupSetup),
+        OnGroupSetup(onSetup),
         Group {
             optional,
             ProcessTask(onProcessSetup, onProcessDone, onProcessError)

src/plugins/coreplugin/locator/ilocatorfilter.cpp

@@ -452,7 +452,7 @@ void LocatorMatcher::start()
 
     QList<TaskItem> parallelTasks { ParallelLimit(d->m_parallelLimit) };
 
-    const auto onGroupSetup = [this, collectorStorage](const TreeStorage<LocatorStorage> &storage,
+    const auto onSetup = [this, collectorStorage](const TreeStorage<LocatorStorage> &storage,
                                                     int index) {
         return [this, collectorStorage, storage, index] {
             ResultsCollector *collector = collectorStorage->m_collector;
@@ -462,7 +462,7 @@ void LocatorMatcher::start()
         };
     };
 
-    const auto onGroupDone = [](const TreeStorage<LocatorStorage> &storage) {
+    const auto onDone = [](const TreeStorage<LocatorStorage> &storage) {
         return [storage] { storage->finalize(); };
     };
 
@@ -472,9 +472,9 @@ void LocatorMatcher::start()
         const Group group {
             optional,
             Storage(storage),
-            OnGroupSetup(onGroupSetup(storage, index)),
-            OnGroupDone(onGroupDone(storage)),
-            OnGroupError(onGroupDone(storage)),
+            OnGroupSetup(onSetup(storage, index)),
+            OnGroupDone(onDone(storage)),
+            OnGroupError(onDone(storage)),
             task.task
         };
         parallelTasks << group;

src/plugins/coreplugin/locator/javascriptfilter.cpp

@@ -371,7 +371,7 @@ LocatorMatcherTasks JavaScriptFilter::matchers()
         m_javaScriptEngine.reset(new JavaScriptEngine);
     QPointer<JavaScriptEngine> engine = m_javaScriptEngine.get();
 
-    const auto onGroupSetup = [storage, engine] {
+    const auto onSetup = [storage, engine] {
         if (!engine)
             return TaskAction::StopWithError;
         if (storage->input().trimmed().isEmpty()) {
@@ -391,11 +391,11 @@ LocatorMatcherTasks JavaScriptFilter::matchers()
         return TaskAction::Continue;
     };
 
-    const auto onSetup = [storage, engine](JavaScriptRequest &request) {
+    const auto onJavaScriptSetup = [storage, engine](JavaScriptRequest &request) {
         request.setEngine(engine);
         request.setEvaluateData(storage->input());
     };
-    const auto onDone = [storage](const JavaScriptRequest &request) {
+    const auto onJavaScriptDone = [storage](const JavaScriptRequest &request) {
         const auto acceptor = [](const QString &clipboardContents) {
             return [clipboardContents] {
                 QGuiApplication::clipboard()->setText(clipboardContents);
@@ -419,15 +419,15 @@ LocatorMatcherTasks JavaScriptFilter::matchers()
 
         storage->reportOutput({entry, copyResultEntry, copyExpressionEntry});
     };
-    const auto onError = [storage](const JavaScriptRequest &request) {
+    const auto onJavaScriptError = [storage](const JavaScriptRequest &request) {
         LocatorFilterEntry entry;
         entry.displayName = request.output().m_output;
         storage->reportOutput({entry});
     };
 
     const Group root {
-        OnGroupSetup(onGroupSetup),
-        JavaScriptRequestTask(onSetup, onDone, onError)
+        OnGroupSetup(onSetup),
+        JavaScriptRequestTask(onJavaScriptSetup, onJavaScriptDone, onJavaScriptError)
     };
 
     return {{root, storage}};

src/plugins/qmakeprojectmanager/qmakestep.cpp

@@ -300,13 +300,13 @@ void QMakeStep::doRun()
         setupProcess(&process);
     };
 
-    const auto onDone = [this](const Process &) {
+    const auto onProcessDone = [this](const Process &) {
         const QString command = displayedParameters()->effectiveCommand().toUserOutput();
         emit addOutput(Tr::tr("The process \"%1\" exited normally.").arg(command),
                        OutputFormat::NormalMessage);
     };
 
-    const auto onError = [this](const Process &process) {
+    const auto onProcessError = [this](const Process &process) {
         const QString command = displayedParameters()->effectiveCommand().toUserOutput();
         if (process.result() == ProcessResult::FinishedWithError) {
             emit addOutput(Tr::tr("The process \"%1\" exited with code %2.")
@@ -326,14 +326,14 @@ void QMakeStep::doRun()
         m_needToRunQMake = true;
     };
 
-    const auto onGroupDone = [this] {
+    const auto onDone = [this] {
         emit buildConfiguration()->buildDirectoryInitialized();
     };
 
-    QList<TaskItem> processList = {ProcessTask(setupQMake, onDone, onError)};
+    QList<TaskItem> processList = {ProcessTask(setupQMake, onProcessDone, onProcessError)};
     if (m_runMakeQmake)
-        processList << ProcessTask(setupMakeQMake, onDone, onError);
-    processList << OnGroupDone(onGroupDone);
+        processList << ProcessTask(setupMakeQMake, onProcessDone, onProcessError);
+    processList << OnGroupDone(onDone);
 
     runTaskTree(Group(processList));
 }