From bc58589dee0bde804258e605a5e6aac11fbfef50 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 19 May 2021 10:56:00 +0200 Subject: [PATCH] Docker: Use new FilePath API directly No need to take the QUrl detour. Change-Id: Ia8245f671411f58729834777413b4749f14b128e Reviewed-by: Christian Stenger --- src/plugins/docker/dockerdevice.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index 7a7b2bfa27a..583bd3c151f 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -588,22 +588,21 @@ DeviceEnvironmentFetcher::Ptr DockerDevice::environmentFetcher() const FilePath DockerDevice::mapToGlobalPath(const FilePath &pathOnDevice) const { - QUrl url = pathOnDevice.toUrl(); - if (url.isValid()) { - QTC_CHECK(url.host() == d->m_data.imageId); - QTC_CHECK(url.scheme() == "docker"); + if (pathOnDevice.needsDevice()) { + // Already correct form, only sanity check it's ours... + QTC_CHECK(handlesFile(pathOnDevice)); return pathOnDevice; } - url.setScheme("docker"); - url.setHost(d->m_data.imageId); - url.setPath(pathOnDevice.toString()); - return FilePath::fromUrl(url); + FilePath result; + result.setScheme("docker"); + result.setHost(d->m_data.imageId); + result.setPath(pathOnDevice.path()); + return result; } bool DockerDevice::handlesFile(const FilePath &filePath) const { - const QUrl &url = filePath.toUrl(); - return url.scheme() == "docker" && url.host() == d->m_data.imageId; + return filePath.scheme() == "docker" && filePath.host() == d->m_data.imageId; } bool DockerDevice::isExecutableFile(const FilePath &filePath) const