FileInProjectFinder: Use FileNameList for file names

This simplifies code and reduces the number of conversions between
QString and Utils::FileName.

Change-Id: I47bd86b9ae09b1da37b4e5e604761367ac1ab26b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

2 files changed, 9 insertions, 8 deletions

diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp
index e1c3c0ec276..d86e8ca9522 100644
--- a/src/libs/utils/fileinprojectfinder.cpp
+++ b/src/libs/utils/fileinprojectfinder.cpp
@@ -95,7 +95,7 @@ QString FileInProjectFinder::projectDirectory() const
     return m_projectDir;
 }
 
-void FileInProjectFinder::setProjectFiles(const QStringList &projectFiles)
+void FileInProjectFinder::setProjectFiles(const Utils::FileNameList &projectFiles)
 {
     if (m_projectFiles == projectFiles)
         return;
@@ -309,9 +309,9 @@ QString FileInProjectFinder::findInSearchPath(const QString &searchPath, const Q
 QStringList FileInProjectFinder::filesWithSameFileName(const QString &fileName) const
 {
     QStringList result;
-    foreach (const QString &f, m_projectFiles) {
-        if (FileName::fromString(f).fileName() == fileName)
-            result << f;
+    foreach (const FileName &f, m_projectFiles) {
+        if (f.fileName() == fileName)
+            result << f.toString();
     }
     return result;
 }
@@ -319,8 +319,8 @@ QStringList FileInProjectFinder::filesWithSameFileName(const QString &fileName)
 QStringList FileInProjectFinder::pathSegmentsWithSameName(const QString &pathSegment) const
 {
     QStringList result;
-    for (const QString &f : m_projectFiles) {
-        QDir dir = FileName::fromString(f).toFileInfo().absoluteDir();
+    for (const FileName &f : m_projectFiles) {
+        QDir dir = f.toFileInfo().absoluteDir();
         do {
             if (dir.dirName() == pathSegment) {
                 if (result.isEmpty() || result.last() != dir.path())
diff --git a/src/libs/utils/fileinprojectfinder.h b/src/libs/utils/fileinprojectfinder.h
index ff4c506a137..546e36031e6 100644
--- a/src/libs/utils/fileinprojectfinder.h
+++ b/src/libs/utils/fileinprojectfinder.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include <utils/utils_global.h>
+#include <utils/fileutils.h>
 
 #include <QHash>
 #include <QStringList>
@@ -48,7 +49,7 @@ public:
     void setProjectDirectory(const QString &absoluteProjectPath);
     QString projectDirectory() const;
 
-    void setProjectFiles(const QStringList &projectFiles);
+    void setProjectFiles(const Utils::FileNameList &projectFiles);
     void setSysroot(const QString &sysroot);
 
     QString findFile(const QUrl &fileUrl, bool *success = nullptr) const;
@@ -73,7 +74,7 @@ private:
 
     QString m_projectDir;
     QString m_sysroot;
-    QStringList m_projectFiles;
+    Utils::FileNameList m_projectFiles;
     QStringList m_searchDirectories;
     mutable QHash<QString,QString> m_cache;
 };