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

AbstractRemoteLinuxDeployStep: Get rid of CheckResult

Browse Source 
Use expected_str<void> instead.

Change-Id: I93518da9ba9393a3db84aefeb9edd164cd830d42
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2023-07-07 11:40:12 +02:00
parent c1c62d0d9e
commit 243341df46
6 changed files with 24 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
View File

@@ -30,7 +30,7 @@ class AbstractRemoteLinuxDeployStepPrivate
{
public:
bool hasError;
std::function<CheckResult()> internalInit;
std::function<expected_str<void>()> internalInit;
std::function<void()> runPreparer;
DeploymentTimeInfo deployTimes;
@@ -73,14 +73,15 @@ bool AbstractRemoteLinuxDeployStep::hasRemoteFileChanged(
return d->deployTimes.hasRemoteFileChanged(deployableFile, kit(), remoteTimestamp);
}
CheckResult AbstractRemoteLinuxDeployStep::isDeploymentPossible() const
expected_str<void> AbstractRemoteLinuxDeployStep::isDeploymentPossible() const
{
if (!deviceConfiguration())
return CheckResult::failure(Tr::tr("No device configuration set."));
return CheckResult::success();
return make_unexpected(Tr::tr("No device configuration set."));
return {};
}
void AbstractRemoteLinuxDeployStep::setInternalInitializer(const std::function<CheckResult ()> &init)
void AbstractRemoteLinuxDeployStep::setInternalInitializer(
const std::function<expected_str<void>()> &init)
{
d->internalInit = init;
}
@@ -108,12 +109,12 @@ QVariantMap AbstractRemoteLinuxDeployStep::toMap() const
bool AbstractRemoteLinuxDeployStep::init()
{
QTC_ASSERT(d->internalInit, return false);
const CheckResult canDeploy = d->internalInit();
const auto canDeploy = d->internalInit();
if (!canDeploy) {
emit addOutput(Tr::tr("Cannot deploy: %1").arg(canDeploy.errorMessage()),
emit addOutput(Tr::tr("Cannot deploy: %1").arg(canDeploy.error()),
OutputFormat::ErrorMessage);
}
return canDeploy;
return bool(canDeploy);
}
void AbstractRemoteLinuxDeployStep::doRun()
@@ -125,9 +126,9 @@ void AbstractRemoteLinuxDeployStep::doRun()
QTC_ASSERT(!d->m_taskTree, return);
const CheckResult check = isDeploymentPossible();
if (!check) {
addErrorMessage(check.errorMessage());
const auto canDeploy = isDeploymentPossible();
if (!canDeploy) {
addErrorMessage(canDeploy.error());
handleFinished();
return;
}