From b0b50257ecbac450d74982e600f0586e507c8fd2 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 2 Mar 2020 18:34:12 +0100 Subject: [PATCH] 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 --- .../autotoolsprojectmanager/autotoolsbuildsystem.cpp | 6 +++--- src/plugins/cmakeprojectmanager/builddirmanager.cpp | 4 ++-- src/plugins/cmakeprojectmanager/builddirmanager.h | 2 +- src/plugins/cmakeprojectmanager/builddirreader.h | 2 +- src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 2 +- src/plugins/cmakeprojectmanager/fileapireader.cpp | 4 ++-- src/plugins/cmakeprojectmanager/fileapireader.h | 2 +- src/plugins/cmakeprojectmanager/servermodereader.h | 2 +- src/plugins/cmakeprojectmanager/tealeafreader.cpp | 4 ++-- src/plugins/cmakeprojectmanager/tealeafreader.h | 2 +- src/plugins/projectexplorer/project.cpp | 4 ++-- src/plugins/projectexplorer/project.h | 2 +- src/plugins/qbsprojectmanager/qbsproject.cpp | 4 ++-- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp index 2345a890768..a6cacabaa26 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp @@ -110,7 +110,7 @@ void AutotoolsBuildSystem::makefileParsingFinished() m_files.clear(); - QVector filesToWatch; + QSet 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(project()->projectDirectory()); diff --git a/src/plugins/cmakeprojectmanager/builddirmanager.cpp b/src/plugins/cmakeprojectmanager/builddirmanager.cpp index d4d90a7a941..75790bee87e 100644 --- a/src/plugins/cmakeprojectmanager/builddirmanager.cpp +++ b/src/plugins/cmakeprojectmanager/builddirmanager.cpp @@ -390,7 +390,7 @@ void BuildDirManager::parse() reparseParameters & REPARSE_FORCE_CONFIGURATION); } -QVector BuildDirManager::takeProjectFilesToWatch() +QSet BuildDirManager::projectFilesToWatch() const { QTC_ASSERT(!m_isHandlingError, return {}); QTC_ASSERT(m_reader, return {}); @@ -398,7 +398,7 @@ QVector 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) diff --git a/src/plugins/cmakeprojectmanager/builddirmanager.h b/src/plugins/cmakeprojectmanager/builddirmanager.h index 00085952a33..3138b24a813 100644 --- a/src/plugins/cmakeprojectmanager/builddirmanager.h +++ b/src/plugins/cmakeprojectmanager/builddirmanager.h @@ -89,7 +89,7 @@ public: bool isFilesystemScanRequested() const; void parse(); - QVector takeProjectFilesToWatch(); + QSet projectFilesToWatch() const; std::unique_ptr generateProjectTree(const QList &allFiles, QString &errorMessage) const; ProjectExplorer::RawProjectParts createRawProjectParts(QString &errorMessage) const; diff --git a/src/plugins/cmakeprojectmanager/builddirreader.h b/src/plugins/cmakeprojectmanager/builddirreader.h index bd04f5676d2..71b5edb974f 100644 --- a/src/plugins/cmakeprojectmanager/builddirreader.h +++ b/src/plugins/cmakeprojectmanager/builddirreader.h @@ -63,7 +63,7 @@ public: virtual bool isParsing() const = 0; - virtual QVector takeProjectFilesToWatch() = 0; + virtual QSet projectFilesToWatch() const = 0; virtual QList takeBuildTargets(QString &errorMessage) = 0; virtual CMakeConfig takeParsedConfiguration(QString &errorMessage) = 0; virtual std::unique_ptr generateProjectTree( diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 2045a84cd28..c346e368ef0 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/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(); { diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp index 83a81f2a70e..089354dc805 100644 --- a/src/plugins/cmakeprojectmanager/fileapireader.cpp +++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp @@ -164,9 +164,9 @@ bool FileApiReader::isParsing() const return m_isParsing; } -QVector FileApiReader::takeProjectFilesToWatch() +QSet FileApiReader::projectFilesToWatch() const { - return QVector::fromList(Utils::toList(m_cmakeFiles)); + return m_cmakeFiles; } QList FileApiReader::takeBuildTargets(QString &errorMessage){ diff --git a/src/plugins/cmakeprojectmanager/fileapireader.h b/src/plugins/cmakeprojectmanager/fileapireader.h index 2d0c1a5809a..560aafc779a 100644 --- a/src/plugins/cmakeprojectmanager/fileapireader.h +++ b/src/plugins/cmakeprojectmanager/fileapireader.h @@ -62,7 +62,7 @@ public: bool isParsing() const final; - QVector takeProjectFilesToWatch() final; + QSet projectFilesToWatch() const final; QList takeBuildTargets(QString &errorMessage) final; CMakeConfig takeParsedConfiguration(QString &errorMessage) final; std::unique_ptr generateProjectTree( diff --git a/src/plugins/cmakeprojectmanager/servermodereader.h b/src/plugins/cmakeprojectmanager/servermodereader.h index dbf91b25296..3910df1778f 100644 --- a/src/plugins/cmakeprojectmanager/servermodereader.h +++ b/src/plugins/cmakeprojectmanager/servermodereader.h @@ -55,7 +55,7 @@ public: bool isParsing() const final; - QVector takeProjectFilesToWatch() final { return {}; }; + QSet projectFilesToWatch() const final { return {}; }; QList takeBuildTargets(QString &errorMessage) final; CMakeConfig takeParsedConfiguration(QString &errorMessage) final; std::unique_ptr generateProjectTree( diff --git a/src/plugins/cmakeprojectmanager/tealeafreader.cpp b/src/plugins/cmakeprojectmanager/tealeafreader.cpp index 31f13234a6e..8b03b33f608 100644 --- a/src/plugins/cmakeprojectmanager/tealeafreader.cpp +++ b/src/plugins/cmakeprojectmanager/tealeafreader.cpp @@ -160,9 +160,9 @@ bool TeaLeafReader::isParsing() const return m_cmakeProcess && m_cmakeProcess->state() != QProcess::NotRunning; } -QVector TeaLeafReader::takeProjectFilesToWatch() +QSet TeaLeafReader::projectFilesToWatch() const { - return transform(m_cmakeFiles, [](const FilePath &p) { return p; }); + return m_cmakeFiles; } QList TeaLeafReader::takeBuildTargets(QString &errorMessage) diff --git a/src/plugins/cmakeprojectmanager/tealeafreader.h b/src/plugins/cmakeprojectmanager/tealeafreader.h index b8dd9996359..ae77afc47ca 100644 --- a/src/plugins/cmakeprojectmanager/tealeafreader.h +++ b/src/plugins/cmakeprojectmanager/tealeafreader.h @@ -54,7 +54,7 @@ public: bool isParsing() const final; - QVector takeProjectFilesToWatch() final; + QSet projectFilesToWatch() const final; QList takeBuildTargets(QString &errorMessage) final; CMakeConfig takeParsedConfiguration(QString &errorMessage) final; std::unique_ptr generateProjectTree( diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 5e511fcedaf..f338b3bfafc 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -354,9 +354,9 @@ void Project::setNeedsInitialExpansion(bool needsExpansion) d->m_needsInitialExpansion = needsExpansion; } -void Project::setExtraProjectFiles(const QVector &projectDocumentPaths) +void Project::setExtraProjectFiles(const QSet &projectDocumentPaths) { - QSet uniqueNewFiles = Utils::toSet(projectDocumentPaths); + QSet uniqueNewFiles = projectDocumentPaths; uniqueNewFiles.remove(projectFilePath()); // Make sure to never add the main project file! QSet existingWatches = Utils::transform(d->m_extraProjectDocuments, diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h index 5fb9c3ad8e7..b93e273a068 100644 --- a/src/plugins/projectexplorer/project.h +++ b/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 &projectDocumentPaths); + void setExtraProjectFiles(const QSet &projectDocumentPaths); void setDisplayName(const QString &name); void setProjectLanguage(Core::Id id, bool enabled); diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 090bfae0afd..f0de5fe9522 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/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>( + const auto filePaths = transform>( 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 nonBuildDirFilePaths = filtered(filePaths, + const QSet nonBuildDirFilePaths = filtered(filePaths, [buildDir](const FilePath &p) { return !p.isChildOf(buildDir); }); diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index e337f84ed53..58e7b48d872 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -263,9 +263,9 @@ void QmakeBuildSystem::updateCodeModels() void QmakeBuildSystem::updateDocuments() { - QVector projectDocuments; + QSet projectDocuments; project()->rootProjectNode()->forEachProjectNode([&projectDocuments](const ProjectNode *n) { - projectDocuments << n->filePath(); + projectDocuments.insert(n->filePath()); }); project()->setExtraProjectFiles(projectDocuments); }