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

TaskTree: Introduce DoneWith enum

Browse Source 
This makes it possible to recognize the cancel state
when the task was automatically stopped because of task's
parent group workflow policy or when the user called TaskTree::stop().

This addresses the 2nd point in the master task below.

Task-number: QTCREATORBUG-28741
Task-number: QTCREATORBUG-29834
Change-Id: I2798b9ec1d2f1d667aff51ee0271a5a15a525dc1
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2023-11-03 09:42:55 +01:00
parent 84edd54699
commit dda75153fe
22 changed files with 104 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1088,7 +1088,7 @@ public:
// in order to unwind properly. // in order to unwind properly.
SetupResult start(); SetupResult start();
void stop(); void stop();
bool invokeDoneHandler(bool success); bool invokeDoneHandler(DoneWith result);
bool isRunning() const { return m_task || m_container.isRunning(); } bool isRunning() const { return m_task || m_container.isRunning(); }
bool isTask() const { return bool(m_taskHandler.m_createHandler); } bool isTask() const { return bool(m_taskHandler.m_createHandler); }
int taskCount() const { return isTask() ? 1 : m_container.m_constData.m_taskCount; } int taskCount() const { return isTask() ? 1 : m_container.m_constData.m_taskCount; }
@@ -1450,7 +1450,7 @@ SetupResult TaskNode::start()
const std::shared_ptr<SetupResult> unwindAction const std::shared_ptr<SetupResult> unwindAction
= std::make_shared<SetupResult>(SetupResult::Continue); = std::make_shared<SetupResult>(SetupResult::Continue);
QObject::connect(m_task.get(), &TaskInterface::done, taskTree(), [=](bool success) { QObject::connect(m_task.get(), &TaskInterface::done, taskTree(), [=](bool success) {
const bool result = invokeDoneHandler(success); const bool result = invokeDoneHandler(success ? DoneWith::Success : DoneWith::Error);
QObject::disconnect(m_task.get(), &TaskInterface::done, taskTree(), nullptr); QObject::disconnect(m_task.get(), &TaskInterface::done, taskTree(), nullptr);
m_task.release()->deleteLater(); m_task.release()->deleteLater();
QTC_ASSERT(parentContainer() && parentContainer()->isRunning(), return); QTC_ASSERT(parentContainer() && parentContainer()->isRunning(), return);
@@ -1478,24 +1478,24 @@ void TaskNode::stop()
// TODO: cancelHandler? // TODO: cancelHandler?
// TODO: call TaskInterface::stop() ? // TODO: call TaskInterface::stop() ?
invokeDoneHandler(false); invokeDoneHandler(DoneWith::Cancel);
m_task.reset(); m_task.reset();
} }
static bool shouldCall(CallDoneIf callDoneIf, bool success) static bool shouldCall(CallDoneIf callDoneIf, DoneWith result)
{ {
if (success) if (result == DoneWith::Success)
return callDoneIf != CallDoneIf::Error; return callDoneIf != CallDoneIf::Error;
return callDoneIf != CallDoneIf::Success; return callDoneIf != CallDoneIf::Success;
} }
bool TaskNode::invokeDoneHandler(bool success) bool TaskNode::invokeDoneHandler(DoneWith result)
{ {
bool result = success; bool success = result == DoneWith::Success;
if (m_taskHandler.m_doneHandler && shouldCall(m_taskHandler.m_callDoneIf, success)) if (m_taskHandler.m_doneHandler && shouldCall(m_taskHandler.m_callDoneIf, result))
result = invokeHandler(parentContainer(), m_taskHandler.m_doneHandler, *m_task.get(), success); success = invokeHandler(parentContainer(), m_taskHandler.m_doneHandler, *m_task.get(), result);
m_container.m_constData.m_taskTreePrivate->advanceProgress(1); m_container.m_constData.m_taskTreePrivate->advanceProgress(1);
return result; return success;
} }
/*! /*!

29
src/libs/solutions/tasking/tasktree.h
View File

@@ -132,6 +132,14 @@ enum class SetupResult
}; };
Q_ENUM_NS(SetupResult); Q_ENUM_NS(SetupResult);
enum class DoneWith
{
Success,
Error,
Cancel
};
Q_ENUM_NS(DoneWith);
enum class CallDoneIf enum class CallDoneIf
{ {
SuccessOrError, SuccessOrError,
@@ -148,7 +156,7 @@ public:
// Called prior to task start, just after createHandler // Called prior to task start, just after createHandler
using TaskSetupHandler = std::function<SetupResult(TaskInterface &)>; using TaskSetupHandler = std::function<SetupResult(TaskInterface &)>;
// Called on task done, just before deleteLater // Called on task done, just before deleteLater
using TaskDoneHandler = std::function<bool(const TaskInterface &, bool)>; using TaskDoneHandler = std::function<bool(const TaskInterface &, DoneWith)>;
// Called when group entered // Called when group entered
using GroupSetupHandler = std::function<SetupResult()>; using GroupSetupHandler = std::function<SetupResult()>;
// Called when group done / error // Called when group done / error
@@ -335,7 +343,7 @@ public:
"The Adapter type for the CustomTask<Adapter> needs to be derived from " "The Adapter type for the CustomTask<Adapter> needs to be derived from "
"TaskAdapter<Task>."); "TaskAdapter<Task>.");
using SetupFunction = std::function<void(const Task &)>; using SetupFunction = std::function<void(const Task &)>;
using DoneFunction = std::function<bool(const Task &, bool)>; using DoneFunction = std::function<bool(const Task &, DoneWith)>;
static Adapter *createAdapter() { return new Adapter; } static Adapter *createAdapter() { return new Adapter; }
template <typename SetupHandler = SetupFunction, typename DoneHandler = DoneFunction> template <typename SetupHandler = SetupFunction, typename DoneHandler = DoneFunction>
@@ -376,37 +384,38 @@ private:
if constexpr (std::is_same_v<Handler, DoneFunction>) if constexpr (std::is_same_v<Handler, DoneFunction>)
return {}; // When user passed {} for the done handler. return {}; // When user passed {} for the done handler.
static constexpr bool is2ArgDynamic static constexpr bool is2ArgDynamic
= std::is_invocable_r_v<bool, std::decay_t<Handler>, const Task &, bool>; = std::is_invocable_r_v<bool, std::decay_t<Handler>, const Task &, DoneWith>;
static constexpr bool is1ArgDynamic static constexpr bool is1ArgDynamic
= std::is_invocable_r_v<bool, std::decay_t<Handler>, const Task &>; = std::is_invocable_r_v<bool, std::decay_t<Handler>, const Task &>;
static constexpr bool is0ArgDynamic static constexpr bool is0ArgDynamic
= std::is_invocable_r_v<bool, std::decay_t<Handler>>; = std::is_invocable_r_v<bool, std::decay_t<Handler>>;
static constexpr bool is2ArgVoid static constexpr bool is2ArgVoid
= std::is_invocable_r_v<void, std::decay_t<Handler>, const Task &, bool>; = std::is_invocable_r_v<void, std::decay_t<Handler>, const Task &, DoneWith>;
static constexpr bool is1ArgVoid static constexpr bool is1ArgVoid
= std::is_invocable_r_v<void, std::decay_t<Handler>, const Task &>; = std::is_invocable_r_v<void, std::decay_t<Handler>, const Task &>;
static constexpr bool is0ArgVoid static constexpr bool is0ArgVoid
= std::is_invocable_r_v<void, std::decay_t<Handler>>; = std::is_invocable_r_v<void, std::decay_t<Handler>>;
static constexpr bool isInvocable = is2ArgDynamic || is1ArgDynamic || is0ArgDynamic static constexpr bool isInvocable = is2ArgDynamic || is2ArgVoid
|| is2ArgVoid || is1ArgVoid || is0ArgVoid; || is1ArgDynamic || is1ArgVoid
|| is0ArgDynamic || is0ArgVoid;
static_assert(isInvocable, static_assert(isInvocable,
"Task done handler needs to take (const Task &, bool) as arguments (optionally) and " "Task done handler needs to take (const Task &, bool) as arguments (optionally) and "
"has to return void or bool. The passed handler doesn't fulfill these requirements."); "has to return void or bool. The passed handler doesn't fulfill these requirements.");
return [=](const TaskInterface &taskInterface, bool success) { return [=](const TaskInterface &taskInterface, DoneWith result) {
const Adapter &adapter = static_cast<const Adapter &>(taskInterface); const Adapter &adapter = static_cast<const Adapter &>(taskInterface);
if constexpr (is2ArgDynamic) if constexpr (is2ArgDynamic)
return std::invoke(handler, *adapter.task(), success); return std::invoke(handler, *adapter.task(), result);
if constexpr (is1ArgDynamic) if constexpr (is1ArgDynamic)
return std::invoke(handler, *adapter.task()); return std::invoke(handler, *adapter.task());
if constexpr (is0ArgDynamic) if constexpr (is0ArgDynamic)
return std::invoke(handler); return std::invoke(handler);
if constexpr (is2ArgVoid) if constexpr (is2ArgVoid)
std::invoke(handler, *adapter.task(), success); std::invoke(handler, *adapter.task(), result);
else if constexpr (is1ArgVoid) else if constexpr (is1ArgVoid)
std::invoke(handler, *adapter.task()); std::invoke(handler, *adapter.task());
else if constexpr (is0ArgVoid) else if constexpr (is0ArgVoid)
std::invoke(handler); std::invoke(handler);
return success; return result == DoneWith::Success;
}; };
}; };
}; };

8
src/plugins/android/androidsdkdownloader.cpp
View File

@@ -130,11 +130,11 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
#endif #endif
}); });
}; };
const auto onQueryDone = [this, storage](const NetworkQuery &query, bool success) { const auto onQueryDone = [this, storage](const NetworkQuery &query, DoneWith result) {
QNetworkReply *reply = query.reply(); QNetworkReply *reply = query.reply();
QTC_ASSERT(reply, return); QTC_ASSERT(reply, return);
const QUrl url = reply->url(); const QUrl url = reply->url();
if (!success) { if (result != DoneWith::Success) {
logError(Tr::tr("Downloading Android SDK Tools from URL %1 has failed: %2.") logError(Tr::tr("Downloading Android SDK Tools from URL %1 has failed: %2.")
.arg(url.toString(), reply->errorString())); .arg(url.toString(), reply->errorString()));
return; return;
@@ -171,8 +171,8 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
unarchiver.setDestDir(sdkFileName.parentDir()); unarchiver.setDestDir(sdkFileName.parentDir());
return SetupResult::Continue; return SetupResult::Continue;
}; };
const auto onUnarchiverDone = [this, storage](const Unarchiver &, bool success) { const auto onUnarchiverDone = [this, storage](const Unarchiver &, DoneWith result) {
if (!success) { if (result != DoneWith::Success) {
logError(Tr::tr("Unarchiving error.")); logError(Tr::tr("Unarchiving error."));
return; return;
} }

4
src/plugins/boot2qt/qdbmakedefaultappstep.cpp
View File

@@ -55,8 +55,8 @@ private:
handleStdErrData(proc->readAllStandardError()); handleStdErrData(proc->readAllStandardError());
}); });
}; };
const auto onDone = [this](const Process &process, bool success) { const auto onDone = [this](const Process &process, DoneWith result) {
if (!success) if (result != DoneWith::Success)
addErrorMessage(Tr::tr("Remote process failed: %1").arg(process.errorString())); addErrorMessage(Tr::tr("Remote process failed: %1").arg(process.errorString()));
else if (selection() == 0) else if (selection() == 0)
addProgressMessage(Tr::tr("Application set as the default one.")); addProgressMessage(Tr::tr("Application set as the default one."));

4
src/plugins/boot2qt/qdbstopapplicationstep.cpp
View File

@@ -54,8 +54,8 @@ GroupItem QdbStopApplicationStep::deployRecipe()
}); });
return SetupResult::Continue; return SetupResult::Continue;
}; };
const auto onDone = [this](const Process &process, bool success) { const auto onDone = [this](const Process &process, DoneWith result) {
if (success) { if (result == DoneWith::Success) {
addProgressMessage(Tr::tr("Stopped the running application.")); addProgressMessage(Tr::tr("Stopped the running application."));
return; return;
} }

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

@@ -163,12 +163,12 @@ GroupItem clangToolTask(const AnalyzeInputData &input,
qCDebug(LOG).noquote() << "Starting" << commandLine.toUserOutput(); qCDebug(LOG).noquote() << "Starting" << commandLine.toUserOutput();
process.setCommand(commandLine); process.setCommand(commandLine);
}; };
const auto onProcessDone = [=](const Process &process, bool success) { const auto onProcessDone = [=](const Process &process, DoneWith result) {
qCDebug(LOG).noquote() << "Output:\n" << process.cleanedStdOut(); qCDebug(LOG).noquote() << "Output:\n" << process.cleanedStdOut();
if (!outputHandler) if (!outputHandler)
return; return;
if (success) { if (result == DoneWith::Success) {
const QString stdErr = process.cleanedStdErr(); const QString stdErr = process.cleanedStdErr();
if (stdErr.isEmpty()) if (stdErr.isEmpty())
return; return;
@@ -198,17 +198,17 @@ GroupItem clangToolTask(const AnalyzeInputData &input,
input.diagnosticsFilter); input.diagnosticsFilter);
data.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer()); data.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
}; };
const auto onReadDone = [=](const Async<expected_str<Diagnostics>> &data, bool success) { const auto onReadDone = [=](const Async<expected_str<Diagnostics>> &data, DoneWith result) {
if (!outputHandler) if (!outputHandler)
return; return;
const expected_str<Diagnostics> result = data.result(); const expected_str<Diagnostics> diagnosticsResult = data.result();
const bool ok = success && result.has_value(); const bool ok = result == DoneWith::Success && diagnosticsResult.has_value();
Diagnostics diagnostics; Diagnostics diagnostics;
QString error; QString error;
if (ok) if (ok)
diagnostics = *result; diagnostics = *diagnosticsResult;
else else
error = result.error(); error = diagnosticsResult.error();
outputHandler({ok, outputHandler({ok,
input.unit.file, input.unit.file,
storage->outputFilePath, storage->outputFilePath,

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

@@ -394,8 +394,8 @@ LocatorMatcherTasks JavaScriptFilter::matchers()
request.setEngine(engine); request.setEngine(engine);
request.setEvaluateData(storage->input()); request.setEvaluateData(storage->input());
}; };
const auto onJavaScriptDone = [storage](const JavaScriptRequest &request, bool success) { const auto onJavaScriptDone = [storage](const JavaScriptRequest &request, DoneWith result) {
if (!success) { if (result != DoneWith::Success) {
LocatorFilterEntry entry; LocatorFilterEntry entry;
entry.displayName = request.output().m_output; entry.displayName = request.output().m_output;
storage->reportOutput({entry}); storage->reportOutput({entry});
@@ -408,15 +408,15 @@ LocatorMatcherTasks JavaScriptFilter::matchers()
}; };
}; };
const QString input = storage->input(); const QString input = storage->input();
const QString result = request.output().m_output; const QString output = request.output().m_output;
const QString expression = input + " = " + result; const QString expression = input + " = " + output;
LocatorFilterEntry entry; LocatorFilterEntry entry;
entry.displayName = expression; entry.displayName = expression;
LocatorFilterEntry copyResultEntry; LocatorFilterEntry copyResultEntry;
copyResultEntry.displayName = Tr::tr("Copy to clipboard: %1").arg(result); copyResultEntry.displayName = Tr::tr("Copy to clipboard: %1").arg(output);
copyResultEntry.acceptor = acceptor(result); copyResultEntry.acceptor = acceptor(output);
LocatorFilterEntry copyExpressionEntry; LocatorFilterEntry copyExpressionEntry;
copyExpressionEntry.displayName = Tr::tr("Copy to clipboard: %1").arg(expression); copyExpressionEntry.displayName = Tr::tr("Copy to clipboard: %1").arg(expression);

4
src/plugins/git/branchmodel.cpp
View File

@@ -429,8 +429,8 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
}; };
const auto onForEachRefDone = [this, workingDirectory, showError](const Process &process, const auto onForEachRefDone = [this, workingDirectory, showError](const Process &process,
bool success) { DoneWith result) {
if (!success) { if (result != DoneWith::Success) {
if (showError == ShowError::No) if (showError == ShowError::No)
return; return;
const QString message = Tr::tr("Cannot run \"%1\" in \"%2\": %3") const QString message = Tr::tr("Cannot run \"%1\" in \"%2\": %3")

8
src/plugins/git/gitclient.cpp
View File

@@ -423,10 +423,10 @@ ShowController::ShowController(IDocument *document, const QString &id)
setupCommand(process, {"branch", noColorOption, "-a", "--contains", storage->m_commit}); setupCommand(process, {"branch", noColorOption, "-a", "--contains", storage->m_commit});
VcsOutputWindow::appendCommand(process.workingDirectory(), process.commandLine()); VcsOutputWindow::appendCommand(process.workingDirectory(), process.commandLine());
}; };
const auto onBranchesDone = [storage, updateDescription](const Process &process, bool success) { const auto onBranchesDone = [storage, updateDescription](const Process &process, DoneWith result) {
ReloadStorage *data = storage.activeStorage(); ReloadStorage *data = storage.activeStorage();
data->m_branches.clear(); data->m_branches.clear();
if (success) { if (result == DoneWith::Success) {
const QString remotePrefix = "remotes/"; const QString remotePrefix = "remotes/";
const QString localPrefix = "<Local>"; const QString localPrefix = "<Local>";
const int prefixLength = remotePrefix.length(); const int prefixLength = remotePrefix.length();
@@ -469,10 +469,10 @@ ShowController::ShowController(IDocument *document, const QString &id)
storage->m_precedes = busyMessage; storage->m_precedes = busyMessage;
setupCommand(process, {"describe", "--contains", storage->m_commit}); setupCommand(process, {"describe", "--contains", storage->m_commit});
}; };
const auto onPrecedesDone = [storage, updateDescription](const Process &process, bool success) { const auto onPrecedesDone = [storage, updateDescription](const Process &process, DoneWith result) {
ReloadStorage *data = storage.activeStorage(); ReloadStorage *data = storage.activeStorage();
data->m_precedes.clear(); data->m_precedes.clear();
if (success) { if (result == DoneWith::Success) {
data->m_precedes = process.cleanedStdOut().trimmed(); data->m_precedes = process.cleanedStdOut().trimmed();
const int tilde = data->m_precedes.indexOf('~'); const int tilde = data->m_precedes.indexOf('~');
if (tilde != -1) if (tilde != -1)

4
src/plugins/projectexplorer/copystep.cpp
View File

@@ -52,8 +52,8 @@ private:
streamer.setDestination(m_target); streamer.setDestination(m_target);
return SetupResult::Continue; return SetupResult::Continue;
}; };
const auto onDone = [this](const FileStreamer &, bool success) { const auto onDone = [this](const FileStreamer &, DoneWith result) {
if (success) if (result == DoneWith::Success)
addOutput(Tr::tr("Copying finished."), OutputFormat::NormalMessage); addOutput(Tr::tr("Copying finished."), OutputFormat::NormalMessage);
else else
addOutput(Tr::tr("Copying failed."), OutputFormat::ErrorMessage); addOutput(Tr::tr("Copying failed."), OutputFormat::ErrorMessage);

4
src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
View File

@@ -124,8 +124,8 @@ GroupItem QnxDeployQtLibrariesDialogPrivate::checkDirTask()
.arg(fullRemoteDirectory())); .arg(fullRemoteDirectory()));
process.setCommand({m_device->filePath("test"), {"-d", fullRemoteDirectory()}}); process.setCommand({m_device->filePath("test"), {"-d", fullRemoteDirectory()}});
}; };
const auto onDone = [this](const Process &process, bool success) { const auto onDone = [this](const Process &process, DoneWith result) {
if (!success) { if (result != DoneWith::Success) {
if (process.result() != ProcessResult::FinishedWithError) { if (process.result() != ProcessResult::FinishedWithError) {
m_deployLogWindow->appendPlainText(Tr::tr("Connection failed: %1") m_deployLogWindow->appendPlainText(Tr::tr("Connection failed: %1")
.arg(process.errorString())); .arg(process.errorString()));

4
src/plugins/qnx/qnxdevicetester.cpp
View File

@@ -51,8 +51,8 @@ void QnxDeviceTester::testDevice(const ProjectExplorer::IDevice::Ptr &device)
{"-c", QLatin1String("rm %1 > /dev/null 2>&1; echo ABC > %1 && rm %1").arg(pidFile)}); {"-c", QLatin1String("rm %1 > /dev/null 2>&1; echo ABC > %1 && rm %1").arg(pidFile)});
process.setCommand(cmd); process.setCommand(cmd);
}; };
auto onDone = [this](const Process &process, bool success) { auto onDone = [this](const Process &process, DoneWith result) {
if (success) { if (result == DoneWith::Success) {
emit progressMessage(Tr::tr("Files can be created in /var/run.") + '\n'); emit progressMessage(Tr::tr("Files can be created in /var/run.") + '\n');
return; return;
} }

4
src/plugins/qnx/slog2inforunner.cpp
View File

@@ -37,8 +37,8 @@ void Slog2InfoRunner::start()
const auto onTestSetup = [this](Process &process) { const auto onTestSetup = [this](Process &process) {
process.setCommand({device()->filePath("slog2info"), {}}); process.setCommand({device()->filePath("slog2info"), {}});
}; };
const auto onTestDone = [this](const Process &, bool success) { const auto onTestDone = [this](const Process &, DoneWith result) {
if (success) { if (result == DoneWith::Success) {
m_found = true; m_found = true;
return; return;
} }

4
src/plugins/remotelinux/customcommanddeploystep.cpp
View File

@@ -65,8 +65,8 @@ GroupItem CustomCommandDeployStep::deployRecipe()
handleStdErrData(proc->readAllStandardError()); handleStdErrData(proc->readAllStandardError());
}); });
}; };
const auto onDone = [this](const Process &process, bool success) { const auto onDone = [this](const Process &process, DoneWith result) {
if (success) { if (result == DoneWith::Success) {
addProgressMessage(Tr::tr("Remote command finished successfully.")); addProgressMessage(Tr::tr("Remote command finished successfully."));
} else if (process.error() != QProcess::UnknownError } else if (process.error() != QProcess::UnknownError
|| process.exitStatus() != QProcess::NormalExit) { || process.exitStatus() != QProcess::NormalExit) {

7
src/plugins/remotelinux/killappstep.cpp
View File

@@ -55,10 +55,9 @@ GroupItem KillAppStep::deployRecipe()
.arg(m_remoteExecutable.path())); .arg(m_remoteExecutable.path()));
return SetupResult::Continue; return SetupResult::Continue;
}; };
const auto onDone = [this](const DeviceProcessKiller &, bool success) { const auto onDone = [this](const DeviceProcessKiller &, DoneWith result) {
const QString message = success ? Tr::tr("Remote application killed.") const QString message = result == DoneWith::Success ? Tr::tr("Remote application killed.")
: Tr::tr("Failed to kill remote application. " : Tr::tr("Failed to kill remote application. Assuming it was not running.");
"Assuming it was not running.");
addProgressMessage(message); addProgressMessage(message);
}; };
return DeviceProcessKillerTask(onSetup, onDone); return DeviceProcessKillerTask(onSetup, onDone);

20
src/plugins/remotelinux/linuxdevicetester.cpp
View File

@@ -96,8 +96,8 @@ GroupItem GenericLinuxDeviceTesterPrivate::echoTask(const QString &contents) con
emit q->progressMessage(Tr::tr("Sending echo to device...")); emit q->progressMessage(Tr::tr("Sending echo to device..."));
process.setCommand({m_device->filePath("echo"), {contents}}); process.setCommand({m_device->filePath("echo"), {contents}});
}; };
const auto onDone = [this, contents](const Process &process, bool success) { const auto onDone = [this, contents](const Process &process, DoneWith result) {
if (!success) { if (result != DoneWith::Success) {
const QString stdErrOutput = process.cleanedStdErr(); const QString stdErrOutput = process.cleanedStdErr();
if (!stdErrOutput.isEmpty()) if (!stdErrOutput.isEmpty())
emit q->errorMessage(Tr::tr("echo failed: %1").arg(stdErrOutput) + '\n'); emit q->errorMessage(Tr::tr("echo failed: %1").arg(stdErrOutput) + '\n');
@@ -123,8 +123,8 @@ GroupItem GenericLinuxDeviceTesterPrivate::unameTask() const
emit q->progressMessage(Tr::tr("Checking kernel version...")); emit q->progressMessage(Tr::tr("Checking kernel version..."));
process.setCommand({m_device->filePath("uname"), {"-rsm"}}); process.setCommand({m_device->filePath("uname"), {"-rsm"}});
}; };
const auto onDone = [this](const Process &process, bool success) { const auto onDone = [this](const Process &process, DoneWith result) {
if (success) { if (result == DoneWith::Success) {
emit q->progressMessage(process.cleanedStdOut()); emit q->progressMessage(process.cleanedStdOut());
return; return;
} }
@@ -146,8 +146,8 @@ GroupItem GenericLinuxDeviceTesterPrivate::gathererTask() const
emit q->progressMessage(Tr::tr("Checking if specified ports are available...")); emit q->progressMessage(Tr::tr("Checking if specified ports are available..."));
gatherer.setDevice(m_device); gatherer.setDevice(m_device);
}; };
const auto onDone = [this](const DeviceUsedPortsGatherer &gatherer, bool success) { const auto onDone = [this](const DeviceUsedPortsGatherer &gatherer, DoneWith result) {
if (!success) { if (result != DoneWith::Success) {
emit q->errorMessage(Tr::tr("Error gathering ports: %1").arg(gatherer.errorString()) + '\n' emit q->errorMessage(Tr::tr("Error gathering ports: %1").arg(gatherer.errorString()) + '\n'
+ Tr::tr("Some tools will not work out of the box.\n")); + Tr::tr("Some tools will not work out of the box.\n"));
} else if (gatherer.usedPorts().isEmpty()) { } else if (gatherer.usedPorts().isEmpty()) {
@@ -176,9 +176,9 @@ GroupItem GenericLinuxDeviceTesterPrivate::transferTask(FileTransferMethod metho
transfer.setTransferMethod(method); transfer.setTransferMethod(method);
transfer.setTestDevice(m_device); transfer.setTestDevice(m_device);
}; };
const auto onDone = [this, method, storage](const FileTransfer &transfer, bool success) { const auto onDone = [this, method, storage](const FileTransfer &transfer, DoneWith result) {
const QString methodName = FileTransfer::transferMethodName(method); const QString methodName = FileTransfer::transferMethodName(method);
if (success) { if (result == DoneWith::Success) {
emit q->progressMessage(Tr::tr("\"%1\" is functional.\n").arg(methodName)); emit q->progressMessage(Tr::tr("\"%1\" is functional.\n").arg(methodName));
if (method == FileTransferMethod::Rsync) if (method == FileTransferMethod::Rsync)
m_device->setExtraData(Constants::SUPPORTS_RSYNC, true); m_device->setExtraData(Constants::SUPPORTS_RSYNC, true);
@@ -247,8 +247,8 @@ GroupItem GenericLinuxDeviceTesterPrivate::commandTask(const QString &commandNam
command.addArgs(QLatin1String("\"command -v %1\"").arg(commandName), CommandLine::Raw); command.addArgs(QLatin1String("\"command -v %1\"").arg(commandName), CommandLine::Raw);
process.setCommand(command); process.setCommand(command);
}; };
const auto onDone = [this, commandName](const Process &process, bool success) { const auto onDone = [this, commandName](const Process &process, DoneWith result) {
if (success) { if (result == DoneWith::Success) {
emit q->progressMessage(Tr::tr("%1 found.").arg(commandName)); emit q->progressMessage(Tr::tr("%1 found.").arg(commandName));
return; return;
} }

4
src/plugins/remotelinux/tarpackagecreationstep.cpp
View File

@@ -153,8 +153,8 @@ Tasking::GroupItem TarPackageCreationStep::runRecipe()
async.setFutureSynchronizer(&m_synchronizer); async.setFutureSynchronizer(&m_synchronizer);
return SetupResult::Continue; return SetupResult::Continue;
}; };
const auto onDone = [this](const Async<void> &, bool success) { const auto onDone = [this](const Async<void> &, DoneWith result) {
if (!success) { if (result != DoneWith::Success) {
emit addOutput(Tr::tr("Packaging failed."), OutputFormat::ErrorMessage); emit addOutput(Tr::tr("Packaging failed."), OutputFormat::ErrorMessage);
return; return;
} }

8
src/plugins/remotelinux/tarpackagedeploystep.cpp
View File

@@ -74,8 +74,8 @@ GroupItem TarPackageDeployStep::uploadTask()
connect(&transfer, &FileTransfer::progress, this, &TarPackageDeployStep::addProgressMessage); connect(&transfer, &FileTransfer::progress, this, &TarPackageDeployStep::addProgressMessage);
addProgressMessage(Tr::tr("Uploading package to device...")); addProgressMessage(Tr::tr("Uploading package to device..."));
}; };
const auto onDone = [this](const FileTransfer &transfer, bool success) { const auto onDone = [this](const FileTransfer &transfer, DoneWith result) {
if (success) if (result == DoneWith::Success)
addProgressMessage(Tr::tr("Successfully uploaded package file.")); addProgressMessage(Tr::tr("Successfully uploaded package file."));
else else
addErrorMessage(transfer.resultData().m_errorString); addErrorMessage(transfer.resultData().m_errorString);
@@ -98,8 +98,8 @@ GroupItem TarPackageDeployStep::installTask()
}); });
addProgressMessage(Tr::tr("Installing package to device...")); addProgressMessage(Tr::tr("Installing package to device..."));
}; };
const auto onDone = [this](const Process &process, bool success) { const auto onDone = [this](const Process &process, DoneWith result) {
if (success) { if (result == DoneWith::Success) {
saveDeploymentTimeStamp(DeployableFile(m_packageFilePath, {}), {}); saveDeploymentTimeStamp(DeployableFile(m_packageFilePath, {}), {});
addProgressMessage(Tr::tr("Successfully installed package file.")); addProgressMessage(Tr::tr("Successfully installed package file."));
return; return;

4
src/plugins/subversion/subversionclient.cpp
View File

@@ -175,8 +175,8 @@ SubversionDiffEditorController::SubversionDiffEditorController(IDocument *docume
setDescription(Tr::tr("Waiting for data...")); setDescription(Tr::tr("Waiting for data..."));
return SetupResult::Continue; return SetupResult::Continue;
}; };
const auto onDescriptionDone = [this](const Process &process, bool success) { const auto onDescriptionDone = [this](const Process &process, DoneWith result) {
setDescription(success ? process.cleanedStdOut() : QString()); setDescription(result == DoneWith::Success ? process.cleanedStdOut() : QString());
}; };
const auto onDiffSetup = [this](Process &process) { const auto onDiffSetup = [this](Process &process) {

5
src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
View File

@@ -44,8 +44,9 @@ GroupItem VcsBaseDiffEditorController::postProcessTask(const TreeStorage<QString
async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer()); async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
async.setConcurrentCallData(&DiffUtils::readPatchWithPromise, *inputStorage); async.setConcurrentCallData(&DiffUtils::readPatchWithPromise, *inputStorage);
}; };
const auto onDone = [this](const Async<QList<FileData>> &async, bool success) { const auto onDone = [this](const Async<QList<FileData>> &async, DoneWith result) {
setDiffFiles(success && async.isResultAvailable() ? async.result() : QList<FileData>()); setDiffFiles(result == DoneWith::Success && async.isResultAvailable()
? async.result() : QList<FileData>());
// TODO: We should set the right starting line here // TODO: We should set the right starting line here
}; };
return AsyncTask<QList<FileData>>(onSetup, onDone); return AsyncTask<QList<FileData>>(onSetup, onDone);

19
tests/auto/solutions/tasking/tst_tasking.cpp
View File

@@ -77,12 +77,12 @@ void tst_Tasking::validConstructs()
{ {
const Group task { const Group task {
parallel, parallel,
TestTask([](TaskObject &) {}, [](const TaskObject &, bool) {}), TestTask([](TaskObject &) {}, [](const TaskObject &, DoneWith) {}),
TestTask([](TaskObject &) {}, [](const TaskObject &) {}), TestTask([](TaskObject &) {}, [](const TaskObject &) {}),
TestTask([](TaskObject &) {}, [] {}), TestTask([](TaskObject &) {}, [] {}),
TestTask([](TaskObject &) {}, {}), TestTask([](TaskObject &) {}, {}),
TestTask([](TaskObject &) {}), TestTask([](TaskObject &) {}),
TestTask({}, [](const TaskObject &, bool) {}), TestTask({}, [](const TaskObject &, DoneWith) {}),
TestTask({}, [](const TaskObject &) {}), TestTask({}, [](const TaskObject &) {}),
TestTask({}, [] {}), TestTask({}, [] {}),
TestTask({}, {}), TestTask({}, {}),
@@ -97,7 +97,7 @@ void tst_Tasking::validConstructs()
parallel, parallel,
Group { Group {
parallel, parallel,
TestTask([](TaskObject &) {}, [](const TaskObject &, bool) {}), TestTask([](TaskObject &) {}, [](const TaskObject &, DoneWith) {}),
Group { Group {
parallel, parallel,
TestTask([](TaskObject &) {}, [](const TaskObject &) {}), TestTask([](TaskObject &) {}, [](const TaskObject &) {}),
@@ -108,7 +108,7 @@ void tst_Tasking::validConstructs()
}, },
Group { Group {
parallel, parallel,
TestTask([](TaskObject &) {}, [](const TaskObject &, bool) {}), TestTask([](TaskObject &) {}, [](const TaskObject &, DoneWith) {}),
onGroupDone([] {}) onGroupDone([] {})
} }
}, },
@@ -120,7 +120,7 @@ void tst_Tasking::validConstructs()
const auto setupHandler = [](TaskObject &) {}; const auto setupHandler = [](TaskObject &) {};
const auto finishHandler = [](const TaskObject &) {}; const auto finishHandler = [](const TaskObject &) {};
const auto errorHandler = [](const TaskObject &) {}; const auto errorHandler = [](const TaskObject &) {};
const auto doneHandler = [](const TaskObject &, bool) {}; const auto doneHandler = [](const TaskObject &, DoneWith) {};
const Group task2 { const Group task2 {
parallel, parallel,
@@ -230,10 +230,11 @@ void tst_Tasking::testTree_data()
}; };
}; };
const auto setupDone = [storage](int taskId, bool successTask = true) { const auto setupDone = [storage](int taskId, bool success = true) {
return [storage, taskId, successTask](const TaskObject &, bool success) { return [storage, taskId, success](const TaskObject &, DoneWith result) {
storage->m_log.append({taskId, successTask && success ? Handler::Done : Handler::Error}); const bool done = success && result != DoneWith::Cancel;
return successTask && success; storage->m_log.append({taskId, done ? Handler::Done : Handler::Error});
return done;
}; };
}; };

8
tests/manual/tasking/imagescaling/imagescaling.cpp
View File

@@ -79,8 +79,8 @@ void Images::process()
query.setNetworkAccessManager(&qnam); query.setNetworkAccessManager(&qnam);
query.setRequest(QNetworkRequest(url)); query.setRequest(QNetworkRequest(url));
}; };
const auto onDownloadDone = [this, storage, i](const NetworkQuery &query, bool success) { const auto onDownloadDone = [this, storage, i](const NetworkQuery &query, DoneWith result) {
if (success) if (result == DoneWith::Success)
*storage = query.reply()->readAll(); *storage = query.reply()->readAll();
else else
labels[i]->setText(tr("Download\nError.\nCode: %1.").arg(query.reply()->error())); labels[i]->setText(tr("Download\nError.\nCode: %1.").arg(query.reply()->error()));
@@ -89,8 +89,8 @@ void Images::process()
const auto onScalingSetup = [storage](ConcurrentCall<QImage> &data) { const auto onScalingSetup = [storage](ConcurrentCall<QImage> &data) {
data.setConcurrentCallData(&scale, *storage); data.setConcurrentCallData(&scale, *storage);
}; };
const auto onScalingDone = [this, i](const ConcurrentCall<QImage> &data, bool success) { const auto onScalingDone = [this, i](const ConcurrentCall<QImage> &data, DoneWith result) {
if (success) if (result == DoneWith::Success)
labels[i]->setPixmap(QPixmap::fromImage(data.result())); labels[i]->setPixmap(QPixmap::fromImage(data.result()));
else else
labels[i]->setText(tr("Image\nData\nError.")); labels[i]->setText(tr("Image\nData\nError."));