From 613d2e7d23a56f838ff8c2c904a854acb895d16e Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 28 May 2019 15:51:27 +0200 Subject: [PATCH] Utils: Remove rarely used FilePath constructor Not much benefit interface-wise. Change-Id: I0e605ec235e8072efcbf7e777cf7e8f8ee5e0799 Reviewed-by: Eike Ziller --- src/libs/utils/fileutils.cpp | 7 ------- src/libs/utils/fileutils.h | 1 - .../qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp | 4 ++-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index ff739a90a49..d4437151d46 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -760,13 +760,6 @@ FilePath FilePath::fromStringWithExtension(const QString &filepath, const QStrin return FilePath::fromString(rc); } -/// Constructs a FileName from \a fileName -/// \a fileName is not checked for validity. -FilePath FilePath::fromLatin1(const QByteArray &filename) -{ - return FilePath::fromString(QString::fromLatin1(filename)); -} - /// Constructs a FileName from \a fileName /// \a fileName is only passed through QDir::cleanPath FilePath FilePath::fromUserInput(const QString &filename) diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h index c6d765a2841..fd8f4f74227 100644 --- a/src/libs/utils/fileutils.h +++ b/src/libs/utils/fileutils.h @@ -69,7 +69,6 @@ public: static FilePath fromString(const QString &filepath); static FilePath fromFileInfo(const QFileInfo &info); static FilePath fromStringWithExtension(const QString &filepath, const QString &defaultExtension); - static FilePath fromLatin1(const QByteArray &filepath); static FilePath fromUserInput(const QString &filepath); static FilePath fromUtf8(const char *filepath, int filepathSize = -1); static FilePath fromVariant(const QVariant &variant); diff --git a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp index baef1083e8c..3c938b3e15c 100644 --- a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp +++ b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp @@ -53,7 +53,7 @@ public: auto root = std::make_unique(file); root->addNode(std::move(fileNode)); fileNode = std::make_unique( - Utils::FilePath::fromLatin1( + Utils::FilePath::fromString( ":/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp"), ProjectExplorer::FileType::Source); root->addNode(std::move(fileNode)); @@ -220,7 +220,7 @@ void QmlProfilerDetailsRewriterTest::seedRewriter() auto kit = std::make_unique(); ProjectExplorer::SysRootKitAspect::setSysRoot( - kit.get(), Utils::FilePath::fromLatin1("/nowhere")); + kit.get(), Utils::FilePath::fromString("/nowhere")); DummyProject *project = new DummyProject(Utils::FilePath::fromString(filename)); ProjectExplorer::SessionManager::addProject(project);