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

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

Browse Source 
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>
This commit is contained in:
Jarek Kobus
2023-05-02 09:28:52 +02:00
parent 6f31d87444
commit ceff14303a
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/solutions/tasking/tasktree.cpp
View File

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

10
src/plugins/autotest/testrunner.cpp
View File

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

4
src/plugins/clangtools/clangtoolrunner.cpp
View File

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

10
src/plugins/coreplugin/locator/ilocatorfilter.cpp
View File

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

12
src/plugins/coreplugin/locator/javascriptfilter.cpp
View File

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

12
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

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