5 files changed, 14 insertions, 14 deletions

diff --git a/src/plugins/docker/dockercontainerthread.cpp b/src/plugins/docker/dockercontainerthread.cpp
index 298d700b019..38e3cd44570 100644
--- a/src/plugins/docker/dockercontainerthread.cpp
+++ b/src/plugins/docker/dockercontainerthread.cpp
@@ -41,7 +41,7 @@ public:
         else
             containerId = *create;
 
-        if (Result start = startContainer(); !start)
+        if (Result<> start = startContainer(); !start)
             return make_unexpected(start.error());
 
         return containerId;
@@ -70,7 +70,7 @@ private:
         return m_containerId;
     }
 
-    Result startContainer()
+    Result<> startContainer()
     {
         using namespace std::chrono_literals;
 
@@ -82,7 +82,7 @@ private:
         m_startProcess->start();
         if (!m_startProcess->waitForStarted(5s)) {
             if (m_startProcess->state() == QProcess::NotRunning) {
-                return Result::Error(
+                return ResultError(
                     Tr::tr("Failed starting Docker container. Exit code: %1, output: %2")
                         .arg(m_startProcess->exitCode())
                         .arg(m_startProcess->allOutput()));
@@ -94,7 +94,7 @@ private:
 
         qCDebug(dockerThreadLog) << "Started container: " << m_startProcess->commandLine();
 
-        return Result::Ok;
+        return ResultOk;
     }
 
 private:
@@ -112,15 +112,15 @@ DockerContainerThread::DockerContainerThread(Init init)
     m_thread.start();
 }
 
-Result DockerContainerThread::start()
+Result<> DockerContainerThread::start()
 {
     expected_str<QString> result;
     QMetaObject::invokeMethod(m_internal, &Internal::start, Qt::BlockingQueuedConnection, &result);
     if (result) {
         m_containerId = *result;
-        return Result::Ok;
+        return ResultOk;
     }
-    return Result::Error(result.error());
+    return ResultError(result.error());
 }
 
 DockerContainerThread::~DockerContainerThread()
@@ -138,7 +138,7 @@ expected_str<std::unique_ptr<DockerContainerThread>> DockerContainerThread::crea
 {
     std::unique_ptr<DockerContainerThread> thread(new DockerContainerThread(init));
 
-    if (Result result = thread->start(); !result)
+    if (Result<> result = thread->start(); !result)
         return make_unexpected(result.error());
 
     return thread;
diff --git a/src/plugins/docker/dockercontainerthread.h b/src/plugins/docker/dockercontainerthread.h
index 215dd58c790..72c0f7d394e 100644
--- a/src/plugins/docker/dockercontainerthread.h
+++ b/src/plugins/docker/dockercontainerthread.h
@@ -29,7 +29,7 @@ public:
 
 private:
     DockerContainerThread(Init init);
-    Utils::Result start();
+    Utils::Result<> start();
 
 private:
     QThread m_thread;
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index 0f5483a0352..8f5ac1e52ab 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -229,7 +229,7 @@ public:
         if (auto result = updateContainerAccess(); !result)
             return make_unexpected(result.error());
 
-        Result initResult = Result::Ok;
+        Result<> initResult = ResultOk;
         if (cmdBridgePath->isSameDevice(Docker::Internal::settings().dockerBinaryPath())) {
             initResult = fAccess->init(
                 q->rootPath().withNewPath("/tmp/_qtc_cmdbridge"), q->environment(), false);
@@ -756,10 +756,10 @@ void DockerDevice::shutdown()
     d->shutdown();
 }
 
-Result DockerDevice::updateContainerAccess() const
+Result<> DockerDevice::updateContainerAccess() const
 {
     expected_str<QString> result = d->updateContainerAccess();
-    return result ? Result::Ok : Result::Error(result.error());
+    return result ? ResultOk : ResultError(result.error());
 }
 
 expected_str<CommandLine> DockerDevicePrivate::withDockerExecCmd(
diff --git a/src/plugins/docker/dockerdevice.h b/src/plugins/docker/dockerdevice.h
index 3a3cf92115c..ed849483fc8 100644
--- a/src/plugins/docker/dockerdevice.h
+++ b/src/plugins/docker/dockerdevice.h
@@ -59,7 +59,7 @@ public:
 
     Utils::expected_str<Utils::Environment> systemEnvironmentWithError() const override;
 
-    Utils::Result updateContainerAccess() const;
+    Utils::Result<> updateContainerAccess() const;
     void setMounts(const QStringList &mounts) const;
 
     bool prepareForBuild(const ProjectExplorer::Target *target) override;
diff --git a/src/plugins/docker/dockerdevicewidget.cpp b/src/plugins/docker/dockerdevicewidget.cpp
index a7eaf0384b2..5dd73e66e83 100644
--- a/src/plugins/docker/dockerdevicewidget.cpp
+++ b/src/plugins/docker/dockerdevicewidget.cpp
@@ -104,7 +104,7 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device)
             this,
             [this, logView, dockerDevice, searchPaths] {
                 logView->clear();
-                Result startResult = dockerDevice->updateContainerAccess();
+                Result<> startResult = dockerDevice->updateContainerAccess();
 
                 if (!startResult) {
                     logView->append(Tr::tr("Failed to start container."));