From 535f0da97755b07cd1271fc6f9bfe368e22c7235 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 17 May 2019 13:54:27 +0200
Subject: [PATCH] Utils: Make FileName::shortNativePath a member

Change-Id: If1ab02ae9dc7efb97792cdf3bbdce3bba18b3e3d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/libs/utils/fileutils.cpp                           | 8 ++++----
 src/libs/utils/fileutils.h                             | 3 ++-
 src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp | 2 +-
 src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp | 2 +-
 src/plugins/coreplugin/locator/basefilefilter.cpp      | 2 +-
 src/plugins/coreplugin/locator/filesystemfilter.cpp    | 3 +--
 src/plugins/coreplugin/locator/locator_test.cpp        | 2 +-
 src/plugins/coreplugin/locator/opendocumentsfilter.cpp | 2 +-
 src/plugins/cpptools/cpplocatorfilter_test.cpp         | 4 ++--
 src/plugins/cpptools/indexitem.cpp                     | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index 6f449fb79de..de7fc358b4d 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -254,16 +254,16 @@ FileName FileName::canonicalPath() const
 
   Returns the possibly shortened path with native separators.
 */
-QString FileUtils::shortNativePath(const FileName &path)
+QString FileName::shortNativePath() const
 {
     if (HostOsInfo::isAnyUnixHost()) {
         const FileName home = FileName::fromString(QDir::cleanPath(QDir::homePath()));
-        if (path.isChildOf(home)) {
+        if (isChildOf(home)) {
             return QLatin1Char('~') + QDir::separator()
-                + QDir::toNativeSeparators(path.relativeChildPath(home).toString());
+                + QDir::toNativeSeparators(relativeChildPath(home).toString());
         }
     }
-    return path.toUserOutput();
+    return toUserOutput();
 }
 
 QString FileUtils::fileSystemFriendlyName(const QString &name)
diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h
index cfdbc7d5671..d2a726dccf4 100644
--- a/src/libs/utils/fileutils.h
+++ b/src/libs/utils/fileutils.h
@@ -79,6 +79,8 @@ public:
     QVariant toVariant() const;
 
     QString toUserOutput() const;
+    QString shortNativePath() const;
+
     QString fileName(int pathComponents = 0) const;
     bool exists() const;
 
@@ -132,7 +134,6 @@ public:
             const FileName &srcFilePath, const FileName &tgtFilePath, QString *error = nullptr,
             const std::function<bool (QFileInfo, QFileInfo, QString *)> &copyHelper = nullptr);
     static FileName resolveSymlinks(const FileName &path);
-    static QString shortNativePath(const FileName &path);
     static QString fileSystemFriendlyName(const QString &name);
     static int indexOfQmakeUnfriendly(const QString &name, int startpos = 0);
     static QString qmakeFriendlyName(const QString &name);
diff --git a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
index 19f80d66ccd..47c8219c060 100644
--- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
@@ -70,7 +70,7 @@ void CMakeLocatorFilter::prepareSearch(const QString &entry)
             const int index = title.indexOf(entry);
             if (index >= 0) {
                 Core::LocatorFilterEntry filterEntry(this, title, cmakeProject->projectFilePath().toString());
-                filterEntry.extraInfo = FileUtils::shortNativePath(cmakeProject->projectFilePath());
+                filterEntry.extraInfo = cmakeProject->projectFilePath().shortNativePath();
                 filterEntry.highlightInfo = {index, entry.length()};
                 m_result.append(filterEntry);
             }
diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
index 8d1447b07be..edec9d7f252 100644
--- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
@@ -403,7 +403,7 @@ void ReadOnlyFilesDialogPrivate::initDialog(const QStringList &fileNames)
         auto item = new QTreeWidgetItem(ui.treeWidget);
         item->setText(FileName, visibleName);
         item->setIcon(FileName, FileIconProvider::icon(fileName));
-        item->setText(Folder, Utils::FileUtils::shortNativePath(Utils::FileName::fromFileInfo(directory)));
+        item->setText(Folder, Utils::FileName::fromFileInfo(directory).shortNativePath());
         auto radioButtonGroup = new QButtonGroup;
 
         // Add a button for opening the file with a version control system
diff --git a/src/plugins/coreplugin/locator/basefilefilter.cpp b/src/plugins/coreplugin/locator/basefilefilter.cpp
index d64a2e5d2f7..f5f34a4f43c 100644
--- a/src/plugins/coreplugin/locator/basefilefilter.cpp
+++ b/src/plugins/coreplugin/locator/basefilefilter.cpp
@@ -153,7 +153,7 @@ QList<LocatorFilterEntry> BaseFileFilter::matchesFor(QFutureInterface<LocatorFil
             QFileInfo fi(path);
             LocatorFilterEntry filterEntry(this, fi.fileName(), QString(path + fp.postfix));
             filterEntry.fileName = path;
-            filterEntry.extraInfo = FileUtils::shortNativePath(FileName::fromFileInfo(fi));
+            filterEntry.extraInfo = FileName::fromFileInfo(fi).shortNativePath();
 
             const int matchLevel = matchLevelFor(match, matchText);
             if (hasPathSeparator) {
diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp
index 3c55e002406..d89974b96a3 100644
--- a/src/plugins/coreplugin/locator/filesystemfilter.cpp
+++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp
@@ -142,8 +142,7 @@ QList<LocatorFilterEntry> FileSystemFilter::matchesFor(QFutureInterface<LocatorF
     const QString fullFilePath = dirInfo.filePath(fileName);
     if (!QFileInfo::exists(fullFilePath) && dirInfo.exists()) {
         LocatorFilterEntry createAndOpen(this, tr("Create and Open \"%1\"").arg(entry), fullFilePath);
-        createAndOpen.extraInfo = Utils::FileUtils::shortNativePath(
-                    Utils::FileName::fromString(dirInfo.absolutePath()));
+        createAndOpen.extraInfo = Utils::FileName::fromString(dirInfo.absolutePath()).shortNativePath();
         betterEntries.append(createAndOpen);
     }
 
diff --git a/src/plugins/coreplugin/locator/locator_test.cpp b/src/plugins/coreplugin/locator/locator_test.cpp
index cf99717e5ba..6547fbf4ee4 100644
--- a/src/plugins/coreplugin/locator/locator_test.cpp
+++ b/src/plugins/coreplugin/locator/locator_test.cpp
@@ -89,7 +89,7 @@ void Core::Internal::CorePlugin::test_basefilefilter()
 void Core::Internal::CorePlugin::test_basefilefilter_data()
 {
     auto shortNativePath = [](const QString &file) {
-        return Utils::FileUtils::shortNativePath(Utils::FileName::fromString(file));
+        return Utils::FileName::fromString(file).shortNativePath();
     };
 
     QTest::addColumn<QStringList>("testFiles");
diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
index 575e9925573..a7d2b3e1944 100644
--- a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
+++ b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
@@ -76,7 +76,7 @@ QList<LocatorFilterEntry> OpenDocumentsFilter::matchesFor(QFutureInterface<Locat
         const QRegularExpressionMatch match = regexp.match(displayName);
         if (match.hasMatch()) {
             LocatorFilterEntry filterEntry(this, displayName, QString(fileName + fp.postfix));
-            filterEntry.extraInfo = FileUtils::shortNativePath(FileName::fromString(fileName));
+            filterEntry.extraInfo = FileName::fromString(fileName).shortNativePath();
             filterEntry.fileName = fileName;
             filterEntry.highlightInfo = highlightInfo(match);
             if (match.capturedStart() == 0)
diff --git a/src/plugins/cpptools/cpplocatorfilter_test.cpp b/src/plugins/cpptools/cpplocatorfilter_test.cpp
index 8c6f50390fc..da6a1543601 100644
--- a/src/plugins/cpptools/cpplocatorfilter_test.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter_test.cpp
@@ -166,8 +166,8 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter_data()
     MyTestDataDir testDirectory("testdata_basic");
     const QString testFile = testDirectory.file("file1.cpp");
     const QString objTestFile = testDirectory.file("file1.mm");
-    const QString testFileShort = FileUtils::shortNativePath(FileName::fromString(testFile));
-    const QString objTestFileShort = FileUtils::shortNativePath(FileName::fromString(objTestFile));
+    const QString testFileShort = FileName::fromString(testFile).shortNativePath();
+    const QString objTestFileShort = FileName::fromString(objTestFile).shortNativePath();
 
     QTest::newRow("CppFunctionsFilter")
         << testFile
diff --git a/src/plugins/cpptools/indexitem.cpp b/src/plugins/cpptools/indexitem.cpp
index 1a07d9eada8..b9fb4cdcc5b 100644
--- a/src/plugins/cpptools/indexitem.cpp
+++ b/src/plugins/cpptools/indexitem.cpp
@@ -88,7 +88,7 @@ QString IndexItem::representDeclaration() const
 
 QString IndexItem::shortNativeFilePath() const
 {
-    return Utils::FileUtils::shortNativePath(Utils::FileName::fromString(m_fileName));
+    return Utils::FileName::fromString(m_fileName).shortNativePath();
 }
 
 void IndexItem::squeeze()