diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp index e3e7d69e108..9dde444f7a6 100644 --- a/src/libs/utils/filepath.cpp +++ b/src/libs/utils/filepath.cpp @@ -149,11 +149,6 @@ QFileInfo FilePath::toFileInfo() const return QFileInfo(toFSPathString()); } -FilePath FilePath::fromUrl(const QUrl &url) -{ - return FilePath::fromParts(url.scheme(), url.host(), url.path()); -} - FilePath FilePath::fromParts(const QStringView scheme, const QStringView host, const QStringView path) { FilePath result; @@ -920,8 +915,10 @@ FilePath FilePath::fromUtf8(const char *filename, int filenameSize) FilePath FilePath::fromVariant(const QVariant &variant) { - if (variant.type() == QVariant::Url) - return FilePath::fromUrl(variant.toUrl()); + if (variant.type() == QVariant::Url) { + const QUrl url = variant.toUrl(); + return FilePath::fromParts(url.scheme(), url.host(), url.path()); + } return FilePath::fromUserInput(variant.toString()); } diff --git a/src/libs/utils/filepath.h b/src/libs/utils/filepath.h index 4561c5d5561..bc473c29d1c 100644 --- a/src/libs/utils/filepath.h +++ b/src/libs/utils/filepath.h @@ -62,7 +62,6 @@ public: [[nodiscard]] static FilePath fromUserInput(const QString &filepath); [[nodiscard]] static FilePath fromUtf8(const char *filepath, int filepathSize = -1); [[nodiscard]] static FilePath fromVariant(const QVariant &variant); - [[nodiscard]] static FilePath fromUrl(const QUrl &url); [[nodiscard]] static FilePath fromParts(const QStringView scheme, const QStringView host, const QStringView path); [[nodiscard]] static FilePath fromPathPart(const QStringView path); diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index cc985f312f8..cfaeb382a73 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -405,15 +405,14 @@ static QWidget *dialogParent(QWidget *parent) return parent ? parent : s_dialogParentGetter ? s_dialogParentGetter() : nullptr; } - -FilePath qUrlToFilePath(const QUrl &url) +static FilePath qUrlToFilePath(const QUrl &url) { if (url.isLocalFile()) return FilePath::fromString(url.toLocalFile()); - return FilePath::fromUrl(url); + return FilePath::fromParts(url.scheme(), url.host(), url.path()); } -QUrl filePathToQUrl(const FilePath &filePath) +static QUrl filePathToQUrl(const FilePath &filePath) { return QUrl::fromLocalFile(filePath.toFSPathString()); }