ProjectExplorer: Pass extra project files as QSet

They are available in some cases as such, and consumed as such.

Change-Id: I9866c7d7bd817fb19a8b11a0efbe583ed55fe393
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp

@@ -110,7 +110,7 @@ void AutotoolsBuildSystem::makefileParsingFinished()
 
     m_files.clear();
 
-    QVector<Utils::FilePath> filesToWatch;
+    QSet<Utils::FilePath> filesToWatch;
 
     // Apply sources to m_files, which are returned at AutotoolsBuildSystem::files()
     const QFileInfo fileInfo = projectFilePath().toFileInfo();
@@ -127,7 +127,7 @@ void AutotoolsBuildSystem::makefileParsingFinished()
 
         m_files.append(absMakefile);
 
-        filesToWatch.append(Utils::FilePath::fromString(absMakefile));
+        filesToWatch.insert(Utils::FilePath::fromString(absMakefile));
     }
 
     // Add configure.ac file to project and watch for changes.
@@ -137,7 +137,7 @@ void AutotoolsBuildSystem::makefileParsingFinished()
         const QString absConfigureAc = dir.absoluteFilePath(configureAc);
         m_files.append(absConfigureAc);
 
-        filesToWatch.append(Utils::FilePath::fromString(absConfigureAc));
+        filesToWatch.insert(Utils::FilePath::fromString(absConfigureAc));
     }
 
     auto newRoot = std::make_unique<ProjectNode>(project()->projectDirectory());

src/plugins/cmakeprojectmanager/builddirmanager.cpp

@@ -390,7 +390,7 @@ void BuildDirManager::parse()
                     reparseParameters & REPARSE_FORCE_CONFIGURATION);
 }
 
-QVector<FilePath> BuildDirManager::takeProjectFilesToWatch()
+QSet<FilePath> BuildDirManager::projectFilesToWatch() const
 {
     QTC_ASSERT(!m_isHandlingError, return {});
     QTC_ASSERT(m_reader, return {});
@@ -398,7 +398,7 @@ QVector<FilePath> BuildDirManager::takeProjectFilesToWatch()
     Utils::FilePath sourceDir = m_parameters.sourceDirectory;
     Utils::FilePath buildDir = m_parameters.workDirectory;
 
-    return Utils::filtered(m_reader->takeProjectFilesToWatch(),
+    return Utils::filtered(m_reader->projectFilesToWatch(),
                            [&sourceDir,
                            &buildDir](const Utils::FilePath &p) {
         return p.isChildOf(sourceDir)

src/plugins/cmakeprojectmanager/builddirmanager.h

@@ -89,7 +89,7 @@ public:
     bool isFilesystemScanRequested() const;
     void parse();
 
-    QVector<Utils::FilePath> takeProjectFilesToWatch();
+    QSet<Utils::FilePath> projectFilesToWatch() const;
     std::unique_ptr<CMakeProjectNode> generateProjectTree(const QList<const ProjectExplorer::FileNode *> &allFiles,
                              QString &errorMessage) const;
     ProjectExplorer::RawProjectParts createRawProjectParts(QString &errorMessage) const;

src/plugins/cmakeprojectmanager/builddirreader.h

@@ -63,7 +63,7 @@ public:
 
     virtual bool isParsing() const = 0;
 
-    virtual QVector<Utils::FilePath> takeProjectFilesToWatch() = 0;
+    virtual QSet<Utils::FilePath> projectFilesToWatch() const = 0;
     virtual QList<CMakeBuildTarget> takeBuildTargets(QString &errorMessage) = 0;
     virtual CMakeConfig takeParsedConfiguration(QString &errorMessage) = 0;
     virtual std::unique_ptr<CMakeProjectNode> generateProjectTree(

src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

@@ -409,7 +409,7 @@ void CMakeBuildSystem::updateProjectData()
 
     QTC_ASSERT(m_treeScanner.isFinished() && !m_buildDirManager.isParsing(), return);
 
-    m_buildConfiguration->project()->setExtraProjectFiles(m_buildDirManager.takeProjectFilesToWatch());
+    m_buildConfiguration->project()->setExtraProjectFiles(m_buildDirManager.projectFilesToWatch());
 
     CMakeConfig patchedConfig = m_buildConfiguration->configurationFromCMake();
     {

src/plugins/cmakeprojectmanager/fileapireader.cpp

@@ -164,9 +164,9 @@ bool FileApiReader::isParsing() const
     return m_isParsing;
 }
 
-QVector<FilePath> FileApiReader::takeProjectFilesToWatch()
+QSet<FilePath> FileApiReader::projectFilesToWatch() const
 {
-    return QVector<FilePath>::fromList(Utils::toList(m_cmakeFiles));
+    return m_cmakeFiles;
 }
 
 QList<CMakeBuildTarget> FileApiReader::takeBuildTargets(QString &errorMessage){

src/plugins/cmakeprojectmanager/fileapireader.h

@@ -62,7 +62,7 @@ public:
 
     bool isParsing() const final;
 
-    QVector<Utils::FilePath> takeProjectFilesToWatch() final;
+    QSet<Utils::FilePath> projectFilesToWatch() const final;
     QList<CMakeBuildTarget> takeBuildTargets(QString &errorMessage) final;
     CMakeConfig takeParsedConfiguration(QString &errorMessage) final;
     std::unique_ptr<CMakeProjectNode> generateProjectTree(

src/plugins/cmakeprojectmanager/servermodereader.h

@@ -55,7 +55,7 @@ public:
 
     bool isParsing() const final;
 
-    QVector<Utils::FilePath> takeProjectFilesToWatch() final { return {}; };
+    QSet<Utils::FilePath> projectFilesToWatch() const final { return {}; };
     QList<CMakeBuildTarget> takeBuildTargets(QString &errorMessage) final;
     CMakeConfig takeParsedConfiguration(QString &errorMessage) final;
     std::unique_ptr<CMakeProjectNode> generateProjectTree(

src/plugins/cmakeprojectmanager/tealeafreader.cpp

@@ -160,9 +160,9 @@ bool TeaLeafReader::isParsing() const
     return m_cmakeProcess && m_cmakeProcess->state() != QProcess::NotRunning;
 }
 
-QVector<FilePath> TeaLeafReader::takeProjectFilesToWatch()
+QSet<FilePath> TeaLeafReader::projectFilesToWatch() const
 {
-    return transform<QVector>(m_cmakeFiles, [](const FilePath &p) { return p; });
+    return m_cmakeFiles;
 }
 
 QList<CMakeBuildTarget> TeaLeafReader::takeBuildTargets(QString &errorMessage)

src/plugins/cmakeprojectmanager/tealeafreader.h

@@ -54,7 +54,7 @@ public:
 
     bool isParsing() const final;
 
-    QVector<Utils::FilePath> takeProjectFilesToWatch() final;
+    QSet<Utils::FilePath> projectFilesToWatch() const final;
     QList<CMakeBuildTarget> takeBuildTargets(QString &errorMessage) final;
     CMakeConfig takeParsedConfiguration(QString &errorMessage) final;
     std::unique_ptr<CMakeProjectNode> generateProjectTree(

src/plugins/projectexplorer/project.cpp

@@ -354,9 +354,9 @@ void Project::setNeedsInitialExpansion(bool needsExpansion)
     d->m_needsInitialExpansion = needsExpansion;
 }
 
-void Project::setExtraProjectFiles(const QVector<Utils::FilePath> &projectDocumentPaths)
+void Project::setExtraProjectFiles(const QSet<Utils::FilePath> &projectDocumentPaths)
 {
-    QSet<Utils::FilePath> uniqueNewFiles = Utils::toSet(projectDocumentPaths);
+    QSet<Utils::FilePath> uniqueNewFiles = projectDocumentPaths;
     uniqueNewFiles.remove(projectFilePath()); // Make sure to never add the main project file!
 
     QSet<Utils::FilePath> existingWatches = Utils::transform<QSet>(d->m_extraProjectDocuments,

src/plugins/projectexplorer/project.h

@@ -164,7 +164,7 @@ public:
 
     // Set project files that will be watched and trigger the same callback
     // as the main project file.
-    void setExtraProjectFiles(const QVector<Utils::FilePath> &projectDocumentPaths);
+    void setExtraProjectFiles(const QSet<Utils::FilePath> &projectDocumentPaths);
 
     void setDisplayName(const QString &name);
     void setProjectLanguage(Core::Id id, bool enabled);

src/plugins/qbsprojectmanager/qbsproject.cpp

@@ -700,13 +700,13 @@ void QbsBuildSystem::updateDocuments()
     OpTimer opTimer("updateDocuments");
     const FilePath buildDir = FilePath::fromString(
                 m_projectData.value("build-directory").toString());
-    const auto filePaths = transform<QVector<FilePath>>(
+    const auto filePaths = transform<QSet<FilePath>>(
             m_projectData.value("build-system-files").toArray(),
             [](const QJsonValue &v) { return FilePath::fromString(v.toString()); });
 
     // A changed qbs file (project, module etc) should trigger a re-parse, but not if
     // the file was generated by qbs itself, in which case that might cause an infinite loop.
-    const QVector<FilePath> nonBuildDirFilePaths = filtered(filePaths,
+    const QSet<FilePath> nonBuildDirFilePaths = filtered(filePaths,
                                                             [buildDir](const FilePath &p) {
                                                                 return !p.isChildOf(buildDir);
                                                             });

src/plugins/qmakeprojectmanager/qmakeproject.cpp

@@ -263,9 +263,9 @@ void QmakeBuildSystem::updateCodeModels()
 
 void QmakeBuildSystem::updateDocuments()
 {
-    QVector<FilePath> projectDocuments;
+    QSet<FilePath> projectDocuments;
     project()->rootProjectNode()->forEachProjectNode([&projectDocuments](const ProjectNode *n) {
-        projectDocuments << n->filePath();
+        projectDocuments.insert(n->filePath());
     });
     project()->setExtraProjectFiles(projectDocuments);
 }