aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorJarek Kobus <[email protected]>2023-11-15 10:33:31 +0100
committerJarek Kobus <[email protected]>2023-11-17 09:44:20 +0000
commit659f0f000c7e41210f5318d67ed23ee68c7dc16b (patch)
tree147417a45ed388e929f5fc61519c75ed157cdd8b /src/plugins
parent6f3bc431fc5a0bcde258f53d8c6e1d2d5ad80539 (diff)
TaskTree: Unify TaskInterface::done(DoneResult) signal
Change the argument of TaskInterface::done() signal from bool into DoneResult. Make it consistent with other TaskTree API. Introduce toDoneResult(bool success) helper. Change-Id: I7b3041d7c1ed0317c76adbc1fd37448231e85f82 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/clangtools/clangtool.cpp10
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildstep.cpp6
-rw-r--r--src/plugins/coreplugin/locator/ilocatorfilter.cpp2
-rw-r--r--src/plugins/coreplugin/locator/javascriptfilter.cpp6
-rw-r--r--src/plugins/ios/iosdeploystep.cpp8
-rw-r--r--src/plugins/languageclient/clientrequest.cpp3
-rw-r--r--src/plugins/languageclient/currentdocumentsymbolsrequest.cpp7
-rw-r--r--src/plugins/languageclient/currentdocumentsymbolsrequest.h2
-rw-r--r--src/plugins/projectexplorer/buildmanager.cpp4
-rw-r--r--src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h10
-rw-r--r--src/plugins/projectexplorer/devicesupport/filetransfer.cpp7
-rw-r--r--src/plugins/projectexplorer/devicesupport/idevice.cpp9
-rw-r--r--src/plugins/projectexplorer/devicesupport/idevice.h2
-rw-r--r--src/plugins/qbsprojectmanager/qbsrequest.cpp13
-rw-r--r--src/plugins/qbsprojectmanager/qbsrequest.h2
-rw-r--r--src/plugins/qmldesigner/utils/fileextractor.cpp6
-rw-r--r--src/plugins/studiowelcome/examplecheckout.cpp6
-rw-r--r--src/plugins/valgrind/memchecktool.cpp4
-rw-r--r--src/plugins/valgrind/valgrindprocess.cpp8
-rw-r--r--src/plugins/valgrind/valgrindprocess.h2
-rw-r--r--src/plugins/valgrind/xmlprotocol/parser.cpp7
-rw-r--r--src/plugins/valgrind/xmlprotocol/parser.h2
22 files changed, 70 insertions, 56 deletions
diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp
index 4033785e796..61b30cfa5f2 100644
--- a/src/plugins/clangtools/clangtool.cpp
+++ b/src/plugins/clangtools/clangtool.cpp
@@ -75,11 +75,13 @@ class ProjectBuilderTaskAdapter : public TaskAdapter<QPointer<RunControl>>
public:
void start() final {
connect(BuildManager::instance(), &BuildManager::buildQueueFinished,
- this, &TaskInterface::done);
+ this, [this](bool success) {
+ emit done(toDoneResult(success));
+ });
RunControl *runControl = *task();
- QTC_ASSERT(runControl, emit done(false); return);
+ QTC_ASSERT(runControl, emit done(DoneResult::Error); return);
Target *target = runControl->target();
- QTC_ASSERT(target, emit done(false); return);
+ QTC_ASSERT(target, emit done(DoneResult::Error); return);
if (!BuildManager::isBuilding(target)) {
BuildManager::buildProjectWithDependencies(target->project(), ConfigSelection::Active,
runControl);
@@ -822,7 +824,7 @@ Group ClangTool::runRecipe(const RunSettings &runSettings,
};
topTasks.append(Group {
- Tasking::Storage(storage),
+ Storage(storage),
TaskTreeTask(onTreeSetup, onTreeDone, CallDoneIf::Success)
});
return {topTasks};
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index b2e13b84b54..e1330280f74 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -68,10 +68,12 @@ public:
void start() final {
Target *target = *task();
if (!target) {
- emit done(false);
+ emit done(DoneResult::Error);
return;
}
- connect(target, &Target::parsingFinished, this, &TaskInterface::done);
+ connect(target, &Target::parsingFinished, this, [this](bool success) {
+ emit done(toDoneResult(success));
+ });
}
};
diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.cpp b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
index f66dc0383f5..94cc24831c3 100644
--- a/src/plugins/coreplugin/locator/ilocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
@@ -322,7 +322,7 @@ class ResultsCollectorTaskAdapter : public TaskAdapter<ResultsCollector>
{
public:
ResultsCollectorTaskAdapter() {
- connect(task(), &ResultsCollector::done, this, [this] { emit done(true); });
+ connect(task(), &ResultsCollector::done, this, [this] { emit done(DoneResult::Success); });
}
void start() final { task()->start(); }
};
diff --git a/src/plugins/coreplugin/locator/javascriptfilter.cpp b/src/plugins/coreplugin/locator/javascriptfilter.cpp
index 73c723e9888..f1b8af35b9c 100644
--- a/src/plugins/coreplugin/locator/javascriptfilter.cpp
+++ b/src/plugins/coreplugin/locator/javascriptfilter.cpp
@@ -305,7 +305,7 @@ public:
m_timer.reset();
m_output = output;
m_id = {};
- emit done(output.m_result == JavaScriptResult::FinishedWithSuccess);
+ emit done(toDoneResult(output.m_result == JavaScriptResult::FinishedWithSuccess));
};
m_id = m_engine->addRequest(input);
if (m_timeout > 0ms) {
@@ -318,7 +318,7 @@ public:
m_timer.release()->deleteLater();
m_id = {};
m_output = {Tr::tr("Engine aborted after timeout."), JavaScriptResult::Canceled};
- emit done(false);
+ emit done(DoneResult::Error);
});
m_timer->start();
}
@@ -328,7 +328,7 @@ public:
JavaScriptOutput output() const { return m_output; }
signals:
- void done(bool success);
+ void done(DoneResult result);
private:
QPointer<JavaScriptEngine> m_engine;
diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp
index 3f80d9d931a..02f75d27671 100644
--- a/src/plugins/ios/iosdeploystep.cpp
+++ b/src/plugins/ios/iosdeploystep.cpp
@@ -41,7 +41,7 @@ public:
void setExpectSuccess(bool success) { m_expectSuccess = success; }
void start()
{
- QTC_ASSERT(m_deviceType, emit done(false); return);
+ QTC_ASSERT(m_deviceType, emit done(DoneResult::Error); return);
QTC_ASSERT(!m_toolHandler, return);
m_toolHandler.reset(new IosToolHandler(*m_deviceType));
@@ -65,19 +65,19 @@ public:
TaskHub::addTask(DeploymentTask(Task::Error, Tr::tr("Deployment failed. "
"The settings in the Devices window of Xcode might be incorrect.")));
}
- emit done(status == IosToolHandler::Success);
+ emit done(toDoneResult(status == IosToolHandler::Success));
});
connect(m_toolHandler.get(), &IosToolHandler::finished, this, [this] {
disconnect(m_toolHandler.get(), nullptr, this, nullptr);
m_toolHandler.release()->deleteLater();
TaskHub::addTask(DeploymentTask(Task::Error, Tr::tr("Deployment failed.")));
- emit done(false);
+ emit done(DoneResult::Error);
});
m_toolHandler->requestTransferApp(m_bundlePath, m_deviceType->identifier);
}
signals:
- void done(bool success);
+ void done(DoneResult result);
void progressValueChanged(int progress, const QString &info); // progress in %
void errorMessage(const QString &message);
diff --git a/src/plugins/languageclient/clientrequest.cpp b/src/plugins/languageclient/clientrequest.cpp
index 630a1b01940..4e221f1b9d4 100644
--- a/src/plugins/languageclient/clientrequest.cpp
+++ b/src/plugins/languageclient/clientrequest.cpp
@@ -4,13 +4,14 @@
#include "clientrequest.h"
using namespace LanguageServerProtocol;
+using namespace Tasking;
namespace LanguageClient {
ClientWorkspaceSymbolRequestTaskAdapter::ClientWorkspaceSymbolRequestTaskAdapter()
{
task()->setResponseCallback([this](const WorkspaceSymbolRequest::Response &response){
- emit done(response.result().has_value());
+ emit done(toDoneResult(response.result().has_value()));
});
}
diff --git a/src/plugins/languageclient/currentdocumentsymbolsrequest.cpp b/src/plugins/languageclient/currentdocumentsymbolsrequest.cpp
index 2d272a72161..15506e0e99d 100644
--- a/src/plugins/languageclient/currentdocumentsymbolsrequest.cpp
+++ b/src/plugins/languageclient/currentdocumentsymbolsrequest.cpp
@@ -10,6 +10,7 @@
using namespace Core;
using namespace LanguageServerProtocol;
+using namespace Tasking;
using namespace TextEditor;
using namespace Utils;
@@ -24,7 +25,7 @@ void CurrentDocumentSymbolsRequest::start()
TextDocument *document = TextDocument::currentTextDocument();
Client *client = LanguageClientManager::clientForDocument(document);
if (!client) {
- emit done(false);
+ emit done(DoneResult::Error);
return;
}
@@ -34,7 +35,7 @@ void CurrentDocumentSymbolsRequest::start()
const auto reportFailure = [this] {
clearConnections();
- emit done(false);
+ emit done(DoneResult::Error);
};
const auto updateSymbols = [this, currentUri, pathMapper](const DocumentUri &uri,
@@ -46,7 +47,7 @@ void CurrentDocumentSymbolsRequest::start()
const FilePath filePath = pathMapper ? currentUri.toFilePath(pathMapper) : FilePath();
m_currentDocumentSymbolsData = {filePath, pathMapper, symbols};
clearConnections();
- emit done(true);
+ emit done(DoneResult::Success);
};
m_connections.append(connect(EditorManager::instance(), &EditorManager::currentEditorChanged,
diff --git a/src/plugins/languageclient/currentdocumentsymbolsrequest.h b/src/plugins/languageclient/currentdocumentsymbolsrequest.h
index ef124154dfd..3ea7ee5f152 100644
--- a/src/plugins/languageclient/currentdocumentsymbolsrequest.h
+++ b/src/plugins/languageclient/currentdocumentsymbolsrequest.h
@@ -30,7 +30,7 @@ public:
CurrentDocumentSymbolsData currentDocumentSymbolsData() const { return m_currentDocumentSymbolsData; }
signals:
- void done(bool success);
+ void done(Tasking::DoneResult result);
private:
void clearConnections();
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 46d90d14e80..ef2307309b4 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -67,14 +67,14 @@ private:
this, [this, buildSystem](bool success) {
disconnect(buildSystem, &BuildSystem::parsingFinished, this, nullptr);
if (!success) {
- emit done(false);
+ emit done(DoneResult::Error);
return;
}
checkParsing();
});
return;
}
- emit done(true);
+ emit done(DoneResult::Success);
}
};
diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h
index ee6b2760060..dead5f222a2 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h
+++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h
@@ -11,6 +11,8 @@
#include <utils/portlist.h>
+using namespace Tasking;
+
namespace ProjectExplorer {
namespace Internal {
@@ -45,12 +47,12 @@ private:
};
class PROJECTEXPLORER_EXPORT DeviceUsedPortsGathererTaskAdapter
- : public Tasking::TaskAdapter<DeviceUsedPortsGatherer>
+ : public TaskAdapter<DeviceUsedPortsGatherer>
{
public:
DeviceUsedPortsGathererTaskAdapter() {
- connect(task(), &DeviceUsedPortsGatherer::portListReady, this, [this] { emit done(true); });
- connect(task(), &DeviceUsedPortsGatherer::error, this, [this] { emit done(false); });
+ connect(task(), &DeviceUsedPortsGatherer::portListReady, this, [this] { emit done(DoneResult::Success); });
+ connect(task(), &DeviceUsedPortsGatherer::error, this, [this] { emit done(DoneResult::Error); });
}
void start() final { task()->start(); }
};
@@ -87,6 +89,6 @@ private:
QVector<Internal::SubChannelProvider *> m_channelProviders;
};
-using DeviceUsedPortsGathererTask = Tasking::CustomTask<DeviceUsedPortsGathererTaskAdapter>;
+using DeviceUsedPortsGathererTask = CustomTask<DeviceUsedPortsGathererTaskAdapter>;
} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/devicesupport/filetransfer.cpp b/src/plugins/projectexplorer/devicesupport/filetransfer.cpp
index 05815797672..b31a8f44280 100644
--- a/src/plugins/projectexplorer/devicesupport/filetransfer.cpp
+++ b/src/plugins/projectexplorer/devicesupport/filetransfer.cpp
@@ -196,9 +196,10 @@ QString FileTransfer::transferMethodName(FileTransferMethod method)
FileTransferTaskAdapter::FileTransferTaskAdapter()
{
connect(task(), &FileTransfer::done, this, [this](const ProcessResultData &result) {
- emit done(result.m_exitStatus == QProcess::NormalExit
- && result.m_error == QProcess::UnknownError
- && result.m_exitCode == 0);
+ const bool success = result.m_exitStatus == QProcess::NormalExit
+ && result.m_error == QProcess::UnknownError
+ && result.m_exitCode == 0;
+ emit done(Tasking::toDoneResult(success));
});
}
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index 489e6b337e6..59697554469 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -5,7 +5,6 @@
#include "devicemanager.h"
#include "idevicefactory.h"
-#include "processlist.h"
#include "sshparameters.h"
#include "../kit.h"
@@ -710,6 +709,8 @@ void DeviceProcessSignalOperation::setDebuggerCommand(const FilePath &cmd)
DeviceProcessSignalOperation::DeviceProcessSignalOperation() = default;
+using namespace Tasking;
+
void DeviceProcessKiller::start()
{
m_signalOperation.reset();
@@ -718,7 +719,7 @@ void DeviceProcessKiller::start()
const IDevice::ConstPtr device = DeviceManager::deviceForPath(m_processPath);
if (!device) {
m_errorString = Tr::tr("No device for given path: \"%1\".").arg(m_processPath.toUserOutput());
- emit done(false);
+ emit done(DoneResult::Error);
return;
}
@@ -726,14 +727,14 @@ void DeviceProcessKiller::start()
if (!m_signalOperation) {
m_errorString = Tr::tr("Device for path \"%1\" does not support killing processes.")
.arg(m_processPath.toUserOutput());
- emit done(false);
+ emit done(DoneResult::Error);
return;
}
connect(m_signalOperation.get(), &DeviceProcessSignalOperation::finished,
this, [this](const QString &errorMessage) {
m_errorString = errorMessage;
- emit done(m_errorString.isEmpty());
+ emit done(toDoneResult(m_errorString.isEmpty()));
});
m_signalOperation->killProcess(m_processPath.path());
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h
index a6f9d860b84..4642697c76b 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.h
+++ b/src/plugins/projectexplorer/devicesupport/idevice.h
@@ -279,7 +279,7 @@ public:
QString errorString() const { return m_errorString; }
signals:
- void done(bool success);
+ void done(Tasking::DoneResult result);
private:
Utils::FilePath m_processPath;
diff --git a/src/plugins/qbsprojectmanager/qbsrequest.cpp b/src/plugins/qbsprojectmanager/qbsrequest.cpp
index 1355922b448..e6ac1c2fb89 100644
--- a/src/plugins/qbsprojectmanager/qbsrequest.cpp
+++ b/src/plugins/qbsprojectmanager/qbsrequest.cpp
@@ -13,6 +13,7 @@
#include <utils/qtcassert.h>
using namespace ProjectExplorer;
+using namespace Tasking;
using namespace Utils;
namespace QbsProjectManager::Internal {
@@ -40,7 +41,7 @@ public:
void cancel();
signals:
- void done(bool success);
+ void done(DoneResult result);
void progressChanged(int progress, const QString &info); // progress in %
void outputAdded(const QString &output, ProjectExplorer::BuildStep::OutputFormat format);
void taskAdded(const ProjectExplorer::Task &task);
@@ -114,7 +115,7 @@ void QbsRequestObject::start()
if (m_parseData) {
connect(m_parseData->target(), &Target::parsingFinished, this, [this](bool success) {
disconnect(m_parseData->target(), &Target::parsingFinished, this, nullptr);
- emit done(success);
+ emit done(toDoneResult(success));
});
QMetaObject::invokeMethod(m_parseData.get(), &QbsBuildSystem::startParsing,
Qt::QueuedConnection);
@@ -127,7 +128,7 @@ void QbsRequestObject::start()
emit outputAdded(item.description, BuildStep::OutputFormat::Stdout);
emit taskAdded(CompileTask(Task::Error, item.description, item.filePath, item.line));
}
- emit done(error.items.isEmpty());
+ emit done(toDoneResult(error.items.isEmpty()));
};
connect(m_session, &QbsSession::projectBuilt, this, handleDone);
connect(m_session, &QbsSession::projectCleaned, this, handleDone);
@@ -188,7 +189,7 @@ QbsRequest::~QbsRequest()
void QbsRequest::start()
{
QTC_ASSERT(!m_requestObject, return);
- QTC_ASSERT(m_parseData || (m_session && m_requestData), emit done(false); return);
+ QTC_ASSERT(m_parseData || (m_session && m_requestData), emit done(DoneResult::Error); return);
m_requestObject = new QbsRequestObject;
m_requestObject->setSession(m_session);
@@ -199,10 +200,10 @@ void QbsRequest::start()
m_requestObject->setParseData(m_parseData);
}
- connect(m_requestObject, &QbsRequestObject::done, this, [this](bool success) {
+ connect(m_requestObject, &QbsRequestObject::done, this, [this](DoneResult result) {
m_requestObject->deleteLater();
m_requestObject = nullptr;
- emit done(success);
+ emit done(result);
});
connect(m_requestObject, &QbsRequestObject::progressChanged,
this, &QbsRequest::progressChanged);
diff --git a/src/plugins/qbsprojectmanager/qbsrequest.h b/src/plugins/qbsprojectmanager/qbsrequest.h
index e86909504b6..bd3eb6db43c 100644
--- a/src/plugins/qbsprojectmanager/qbsrequest.h
+++ b/src/plugins/qbsprojectmanager/qbsrequest.h
@@ -28,7 +28,7 @@ public:
void start();
signals:
- void done(bool success);
+ void done(Tasking::DoneResult result);
void progressChanged(int progress, const QString &info); // progress in %
void outputAdded(const QString &output, ProjectExplorer::BuildStep::OutputFormat format);
void taskAdded(const ProjectExplorer::Task &task);
diff --git a/src/plugins/qmldesigner/utils/fileextractor.cpp b/src/plugins/qmldesigner/utils/fileextractor.cpp
index 40381c5a27a..67dc68aca90 100644
--- a/src/plugins/qmldesigner/utils/fileextractor.cpp
+++ b/src/plugins/qmldesigner/utils/fileextractor.cpp
@@ -243,9 +243,9 @@ void FileExtractor::extract()
emit detailedTextChanged();
});
- QObject::connect(m_unarchiver.get(), &Unarchiver::done, this, [this](bool success) {
+ QObject::connect(m_unarchiver.get(), &Unarchiver::done, this, [this](Tasking::DoneResult result) {
m_unarchiver.release()->deleteLater();
- m_finished = success;
+ m_finished = result == Tasking::DoneResult::Success;
m_timer.stop();
m_progress = 100;
@@ -253,7 +253,7 @@ void FileExtractor::extract()
emit targetFolderExistsChanged();
emit finishedChanged();
- QTC_CHECK(success);
+ QTC_CHECK(m_finished);
});
m_unarchiver->start();
}
diff --git a/src/plugins/studiowelcome/examplecheckout.cpp b/src/plugins/studiowelcome/examplecheckout.cpp
index 7b13c59fa88..d0e30824917 100644
--- a/src/plugins/studiowelcome/examplecheckout.cpp
+++ b/src/plugins/studiowelcome/examplecheckout.cpp
@@ -37,6 +37,7 @@
#include <algorithm>
+using namespace Tasking;
using namespace Utils;
void ExampleCheckout::registerTypes()
@@ -124,8 +125,9 @@ DataModelDownloader::DataModelDownloader(QObject * /* parent */)
auto unarchiver = new Unarchiver;
unarchiver->setSourceAndCommand(*sourceAndCommand);
unarchiver->setDestDir(tempFilePath());
- QObject::connect(unarchiver, &Unarchiver::done, this, [this, unarchiver](bool success) {
- QTC_CHECK(success);
+ QObject::connect(unarchiver, &Unarchiver::done, this,
+ [this, unarchiver](DoneResult result) {
+ QTC_CHECK(result == DoneResult::Success);
unarchiver->deleteLater();
emit finished();
});
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 1cbd522571c..5a23bac90ea 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -1051,8 +1051,8 @@ void MemcheckToolPrivate::loadXmlLogFile(const QString &filePath)
m_logParser.reset(new Parser);
connect(m_logParser.get(), &Parser::error, this, &MemcheckToolPrivate::parserError);
- connect(m_logParser.get(), &Parser::done, this, [this](bool success, const QString &err) {
- if (!success)
+ connect(m_logParser.get(), &Parser::done, this, [this](DoneResult result, const QString &err) {
+ if (result == DoneResult::Error)
internalParserError(err);
loadingExternalXmlLogFileFinished();
m_logParser.release()->deleteLater();
diff --git a/src/plugins/valgrind/valgrindprocess.cpp b/src/plugins/valgrind/valgrindprocess.cpp
index e4178f84397..9862d407998 100644
--- a/src/plugins/valgrind/valgrindprocess.cpp
+++ b/src/plugins/valgrind/valgrindprocess.cpp
@@ -93,7 +93,7 @@ public:
const bool success = process->result() == ProcessResult::FinishedWithSuccess;
if (!success)
emit q->processErrorReceived(process->errorString(), process->error());
- emit q->done(success);
+ emit q->done(toDoneResult(success));
});
connect(process, &Process::readyReadStandardOutput, this, [this, process] {
emit q->appendMessage(process->readAllStandardOutput(), StdOutFormat);
@@ -215,7 +215,7 @@ bool ValgrindProcessPrivate::run()
m_taskTree->setRecipe(runRecipe());
connect(m_taskTree.get(), &TaskTree::done, this, [this](DoneWith result) {
m_taskTree.release()->deleteLater();
- emit q->done(result == DoneWith::Success);
+ emit q->done(toDoneResult(result == DoneWith::Success));
});
m_taskTree->start();
return bool(m_taskTree);
@@ -268,8 +268,8 @@ bool ValgrindProcess::runBlocking()
bool ok = false;
QEventLoop loop;
- const auto finalize = [&loop, &ok](bool success) {
- ok = success;
+ const auto finalize = [&loop, &ok](DoneResult result) {
+ ok = result == DoneResult::Success;
// Refer to the QObject::deleteLater() docs.
QMetaObject::invokeMethod(&loop, [&loop] { loop.quit(); }, Qt::QueuedConnection);
};
diff --git a/src/plugins/valgrind/valgrindprocess.h b/src/plugins/valgrind/valgrindprocess.h
index 065d4ad47ad..7a4e722c0da 100644
--- a/src/plugins/valgrind/valgrindprocess.h
+++ b/src/plugins/valgrind/valgrindprocess.h
@@ -50,7 +50,7 @@ signals:
void logMessageReceived(const QByteArray &);
void processErrorReceived(const QString &, QProcess::ProcessError);
void valgrindStarted(qint64 pid);
- void done(bool success);
+ void done(Tasking::DoneResult result);
// Parser's signals
void status(const Valgrind::XmlProtocol::Status &status);
diff --git a/src/plugins/valgrind/xmlprotocol/parser.cpp b/src/plugins/valgrind/xmlprotocol/parser.cpp
index df464e33247..72a393fe7c5 100644
--- a/src/plugins/valgrind/xmlprotocol/parser.cpp
+++ b/src/plugins/valgrind/xmlprotocol/parser.cpp
@@ -25,6 +25,7 @@
#include <QWaitCondition>
#include <QXmlStreamReader>
+using namespace Tasking;
using namespace Utils;
namespace Valgrind::XmlProtocol {
@@ -710,7 +711,7 @@ public:
m_errorString = data.m_internalError;
});
QObject::connect(m_watcher.get(), &QFutureWatcherBase::finished, q, [this] {
- emit q->done(!m_errorString, *m_errorString);
+ emit q->done(toDoneResult(!m_errorString), *m_errorString);
m_watcher.release()->deleteLater();
m_thread.reset();
m_socket.reset();
@@ -786,8 +787,8 @@ bool Parser::runBlocking()
bool ok = false;
QEventLoop loop;
- const auto finalize = [&loop, &ok](bool success) {
- ok = success;
+ const auto finalize = [&loop, &ok](DoneResult result) {
+ ok = result == DoneResult::Success;
// Refer to the QObject::deleteLater() docs.
QMetaObject::invokeMethod(&loop, [&loop] { loop.quit(); }, Qt::QueuedConnection);
};
diff --git a/src/plugins/valgrind/xmlprotocol/parser.h b/src/plugins/valgrind/xmlprotocol/parser.h
index df34601bc35..9116ad6d81a 100644
--- a/src/plugins/valgrind/xmlprotocol/parser.h
+++ b/src/plugins/valgrind/xmlprotocol/parser.h
@@ -45,7 +45,7 @@ signals:
void errorCount(qint64 unique, qint64 count);
void suppressionCount(const QString &name, qint64 count);
void announceThread(const AnnounceThread &announceThread);
- void done(bool success, const QString &errorString);
+ void done(Tasking::DoneResult result, const QString &errorString);
private:
std::unique_ptr<ParserPrivate> d;