diff options
Diffstat (limited to 'src/plugins/projectexplorer')
5 files changed, 18 insertions, 14 deletions
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; |