From 7a9a1b04b1d492b9f3f08a604b0c65502fed761b Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sat, 28 Feb 2015 21:45:07 +0200
Subject: [PATCH] ProjectExplorer: Use FileName in NodesVisitor

Change-Id: Ia02b4dc64b343664b5d47fe3743fbdd0782da121
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
---
 src/plugins/projectexplorer/nodesvisitor.cpp   | 12 ++++++------
 src/plugins/projectexplorer/nodesvisitor.h     | 10 ++++++----
 src/plugins/projectexplorer/session.cpp        |  2 +-
 src/plugins/qmakeprojectmanager/qmakenodes.cpp | 10 +++++-----
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/plugins/projectexplorer/nodesvisitor.cpp b/src/plugins/projectexplorer/nodesvisitor.cpp
index 72855b8ecf2..a950eebdddb 100644
--- a/src/plugins/projectexplorer/nodesvisitor.cpp
+++ b/src/plugins/projectexplorer/nodesvisitor.cpp
@@ -76,7 +76,7 @@ using namespace ProjectExplorer;
   Searches the first node that has the given file as its path.
  */
 
-FindNodesForFileVisitor::FindNodesForFileVisitor(const QString &fileToSearch)
+FindNodesForFileVisitor::FindNodesForFileVisitor(const Utils::FileName &fileToSearch)
     : m_path(fileToSearch)
 {
 }
@@ -93,10 +93,10 @@ void FindNodesForFileVisitor::visitProjectNode(ProjectNode *node)
 
 void FindNodesForFileVisitor::visitFolderNode(FolderNode *node)
 {
-    if (node->path().toString() == m_path)
+    if (node->path() == m_path)
         m_nodes << node;
     foreach (FileNode *fileNode, node->fileNodes()) {
-        if (fileNode->path().toString() == m_path)
+        if (fileNode->path() == m_path)
             m_nodes << fileNode;
     }
 }
@@ -112,7 +112,7 @@ void FindNodesForFileVisitor::visitSessionNode(SessionNode *node)
   Collects file information from all sub file nodes.
  */
 
-QStringList FindAllFilesVisitor::filePaths() const
+Utils::FileNameList FindAllFilesVisitor::filePaths() const
 {
     return m_filePaths;
 }
@@ -124,7 +124,7 @@ void FindAllFilesVisitor::visitProjectNode(ProjectNode *projectNode)
 
 void FindAllFilesVisitor::visitFolderNode(FolderNode *folderNode)
 {
-    m_filePaths.append(folderNode->path().toString());
+    m_filePaths.append(folderNode->path());
     foreach (const FileNode *fileNode, folderNode->fileNodes())
-        m_filePaths.append(fileNode->path().toString());
+        m_filePaths.append(fileNode->path());
 }
diff --git a/src/plugins/projectexplorer/nodesvisitor.h b/src/plugins/projectexplorer/nodesvisitor.h
index 565683ee4ac..570b3b4d5a2 100644
--- a/src/plugins/projectexplorer/nodesvisitor.h
+++ b/src/plugins/projectexplorer/nodesvisitor.h
@@ -33,6 +33,8 @@
 
 #include "projectexplorer_export.h"
 
+#include <utils/fileutils.h>
+
 #include <QStringList>
 
 namespace ProjectExplorer {
@@ -58,7 +60,7 @@ protected:
 
 class PROJECTEXPLORER_EXPORT FindNodesForFileVisitor : public NodesVisitor {
 public:
-    FindNodesForFileVisitor(const QString &fileToSearch);
+    FindNodesForFileVisitor(const Utils::FileName &fileToSearch);
 
     QList<Node*> nodes() const;
 
@@ -66,18 +68,18 @@ public:
     void visitFolderNode(FolderNode *node);
     void visitSessionNode(SessionNode *node);
 private:
-    QString m_path;
+    Utils::FileName m_path;
     QList<Node*> m_nodes;
 };
 
 class PROJECTEXPLORER_EXPORT FindAllFilesVisitor : public NodesVisitor {
 public:
-    QStringList filePaths() const;
+    Utils::FileNameList filePaths() const;
 
     void visitProjectNode(ProjectNode *projectNode);
     void visitFolderNode(FolderNode *folderNode);
 private:
-    QStringList m_filePaths;
+    Utils::FileNameList m_filePaths;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index 0d4b91048a4..591fd04e895 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -540,7 +540,7 @@ QList<Project *> SessionManager::projectOrder(Project *project)
 
 QList<Node *> SessionManager::nodesForFile(const Utils::FileName &fileName)
 {
-    FindNodesForFileVisitor findNodes(fileName.toString());
+    FindNodesForFileVisitor findNodes(fileName);
     sessionNode()->accept(&findNodes);
     return findNodes.nodes();
 }
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
index 874f3b9bcc7..673a27ebe36 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
@@ -995,11 +995,11 @@ bool QmakePriFileNode::addSubProjects(const QStringList &proFilePaths)
 {
     FindAllFilesVisitor visitor;
     accept(&visitor);
-    const QStringList &allFiles = visitor.filePaths();
+    const FileNameList &allFiles = visitor.filePaths();
 
     QStringList uniqueProFilePaths;
     foreach (const QString &proFile, proFilePaths)
-        if (!allFiles.contains(proFile))
+        if (!allFiles.contains(FileName::fromString(proFile)))
             uniqueProFilePaths.append(simplifyProFilePath(proFile));
 
     QStringList failedFiles;
@@ -1030,7 +1030,7 @@ bool QmakePriFileNode::addFiles(const QStringList &filePaths, QStringList *notAd
 
     FindAllFilesVisitor visitor;
     accept(&visitor);
-    const QStringList &allFiles = visitor.filePaths();
+    const FileNameList &allFiles = visitor.filePaths();
 
     typedef QMap<QString, QStringList> TypeFileMap;
     // Split into lists by file type and bulk-add them.
@@ -1056,13 +1056,13 @@ bool QmakePriFileNode::addFiles(const QStringList &filePaths, QStringList *notAd
 
         QStringList uniqueQrcFiles;
         foreach (const QString &file, qrcFiles) {
-            if (!allFiles.contains(file))
+            if (!allFiles.contains(FileName::fromString(file)))
                 uniqueQrcFiles.append(file);
         }
 
         QStringList uniqueFilePaths;
         foreach (const QString &file, typeFiles) {
-            if (!allFiles.contains(file))
+            if (!allFiles.contains(FileName::fromString(file)))
                 uniqueFilePaths.append(file);
         }