From 42d570a3fe89da30ebbc280c79f5565471786db6 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Fri, 8 Jan 2016 16:56:35 +0100
Subject: [PATCH] Rename Project::ExcludeGeneratedFiles
We want to distinguish between source files and generated files. So
let's call them by their names.
Change-Id: I324c4b82ca7fb7d8d0e175ea6c4f14f1306ec929
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
---
src/plugins/classview/classviewparser.cpp | 2 +-
src/plugins/clearcase/clearcaseplugin.cpp | 3 +--
src/plugins/debugger/debuggerplugin.cpp | 2 +-
src/plugins/debugger/debuggerruncontrol.cpp | 6 +++---
src/plugins/modeleditor/modelindexer.cpp | 4 ++--
src/plugins/projectexplorer/project.h | 6 +++++-
src/plugins/qmakeprojectmanager/qmakeproject.cpp | 7 ++++---
src/plugins/qmljstools/qmljsmodelmanager.cpp | 2 +-
src/plugins/qmlprofiler/qmlprofilertool.cpp | 2 +-
src/plugins/qtsupport/qtoutputformatter.cpp | 4 ++--
src/plugins/todo/cpptodoitemsscanner.cpp | 2 +-
src/plugins/todo/todoitemsprovider.cpp | 4 ++--
src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 2 +-
13 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp
index 93b9f9ed7b0..838a59e15cb 100644
--- a/src/plugins/classview/classviewparser.cpp
+++ b/src/plugins/classview/classviewparser.cpp
@@ -651,7 +651,7 @@ void Parser::resetData(const CPlusPlus::Snapshot &snapshot)
// check all projects
foreach (const Project *prj, SessionManager::projects()) {
if (prj)
- fileList += prj->files(Project::ExcludeGeneratedFiles);
+ fileList += prj->files(Project::SourceFiles);
}
setFileList(fileList);
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index 192262d17ea..17d8ccb1bac 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -2078,8 +2078,7 @@ void ClearCasePlugin::updateIndex()
return;
m_checkInAllAction->setEnabled(false);
m_statusMap->clear();
- QFuture<void> result = QtConcurrent::run(&sync,
- project->files(Project::ExcludeGeneratedFiles));
+ QFuture<void> result = QtConcurrent::run(&sync, project->files(Project::SourceFiles));
if (!m_settings.disableIndexer)
ProgressManager::addTask(result, tr("Updating ClearCase Index"), ClearCase::Constants::TASK_INDEX);
}
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 539a83fe837..4461dfde512 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1539,7 +1539,7 @@ void DebuggerPluginPrivate::attachToQmlPort()
}
QStringList sourceFiles;
foreach (Project *project, projects)
- sourceFiles << project->files(Project::ExcludeGeneratedFiles);
+ sourceFiles << project->files(Project::SourceFiles);
rp.projectSourceDirectory =
!projects.isEmpty() ? projects.first()->projectDirectory().toString() : QString();
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 6f0c74bcb50..c93d2667a55 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -421,10 +421,10 @@ void DebuggerRunControlCreator::enrich(const RunConfiguration *runConfig, const
m_rp.projectSourceDirectory = m_project->projectDirectory().toString();
if (m_project && m_rp.projectSourceFiles.isEmpty())
- m_rp.projectSourceFiles = m_project->files(Project::ExcludeGeneratedFiles);
+ m_rp.projectSourceFiles = m_project->files(Project::SourceFiles);
if (m_project && m_rp.projectSourceFiles.isEmpty())
- m_rp.projectSourceFiles = m_project->files(Project::ExcludeGeneratedFiles);
+ m_rp.projectSourceFiles = m_project->files(Project::SourceFiles);
if (false && m_project && m_kit) {
const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(m_kit);
@@ -453,7 +453,7 @@ void DebuggerRunControlCreator::enrich(const RunConfiguration *runConfig, const
if (m_project) {
m_rp.projectSourceDirectory = m_project->projectDirectory().toString();
- m_rp.projectSourceFiles = m_project->files(Project::ExcludeGeneratedFiles);
+ m_rp.projectSourceFiles = m_project->files(Project::SourceFiles);
}
if (m_runConfig)
diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp
index 2dd95ad313a..23735a79405 100644
--- a/src/plugins/modeleditor/modelindexer.cpp
+++ b/src/plugins/modeleditor/modelindexer.cpp
@@ -388,7 +388,7 @@ void ModelIndexer::onProjectFileListChanged(ProjectExplorer::Project *project)
void ModelIndexer::scanProject(ProjectExplorer::Project *project)
{
// TODO harmonize following code with findFirstModel()?
- QStringList files = project->files(ProjectExplorer::Project::ExcludeGeneratedFiles);
+ QStringList files = project->files(ProjectExplorer::Project::SourceFiles);
QQueue<QueuedFile> filesQueue;
QSet<QueuedFile> filesSet;
@@ -471,7 +471,7 @@ QString ModelIndexer::findFirstModel(ProjectExplorer::FolderNode *folderNode)
void ModelIndexer::forgetProject(ProjectExplorer::Project *project)
{
- QStringList files = project->files(ProjectExplorer::Project::ExcludeGeneratedFiles);
+ QStringList files = project->files(ProjectExplorer::Project::SourceFiles);
QMutexLocker locker(&d->indexerMutex);
foreach (const QString &file, files) {
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index 92c440c5bc2..7ac91114684 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -114,7 +114,11 @@ public:
enum class RestoreResult { Ok, Error, UserAbort };
RestoreResult restoreSettings(QString *errorMessage);
- enum FilesMode { AllFiles, ExcludeGeneratedFiles };
+ enum FilesMode {
+ SourceFiles = 0x1,
+ GeneratedFiles = 0x2,
+ AllFiles = SourceFiles | GeneratedFiles
+ };
virtual QStringList files(FilesMode fileMode) const = 0;
// TODO: generalize to find source(s) of generated files?
virtual QString generatedUiHeader(const Utils::FileName &formFile) const;
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index 3eca1333fb4..a6a31990b8f 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -842,8 +842,9 @@ QStringList QmakeProject::files(FilesMode fileMode) const
{
QStringList files;
for (int i = 0; i < FileTypeSize; ++i) {
- files += m_projectFiles->files[i];
- if (fileMode == AllFiles)
+ if (fileMode & SourceFiles)
+ files += m_projectFiles->files[i];
+ if (fileMode & GeneratedFiles)
files += m_projectFiles->generatedFiles[i];
}
@@ -1104,7 +1105,7 @@ void QmakeProject::findProFile(const FileName &fileName, QmakeProFileNode *root,
void QmakeProject::notifyChanged(const FileName &name)
{
- if (files(QmakeProject::ExcludeGeneratedFiles).contains(name.toString())) {
+ if (files(QmakeProject::SourceFiles).contains(name.toString())) {
QList<QmakeProFileNode *> list;
findProFile(name, rootProjectNode(), list);
foreach (QmakeProFileNode *node, list) {
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp
index e5216eaeee3..14b716cb219 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -88,7 +88,7 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject(
<< QLatin1String(Constants::QMLPROJECT_MIMETYPE)
<< QLatin1String(Constants::QMLTYPES_MIMETYPE)
<< QLatin1String(Constants::QMLUI_MIMETYPE);
- foreach (const QString &filePath, project->files(Project::ExcludeGeneratedFiles)) {
+ foreach (const QString &filePath, project->files(Project::SourceFiles)) {
if (qmlTypeNames.contains(mdb.mimeTypeForFile(filePath).name()))
projectInfo.sourceFiles << filePath;
}
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index bcc46aed169..3c92f8c19c0 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -348,7 +348,7 @@ void QmlProfilerTool::populateFileFinder(QString projectDirectory, QString activ
projects.insert(0, startupProject);
}
foreach (Project *project, projects)
- sourceFiles << project->files(Project::ExcludeGeneratedFiles);
+ sourceFiles << project->files(Project::SourceFiles);
if (!projects.isEmpty()) {
if (projectDirectory.isEmpty())
diff --git a/src/plugins/qtsupport/qtoutputformatter.cpp b/src/plugins/qtsupport/qtoutputformatter.cpp
index 27eb85be3c0..eb65bf182f7 100644
--- a/src/plugins/qtsupport/qtoutputformatter.cpp
+++ b/src/plugins/qtsupport/qtoutputformatter.cpp
@@ -90,7 +90,7 @@ QtOutputFormatter::QtOutputFormatter(Project *project)
: d(new Internal::QtOutputFormatterPrivate(project))
{
if (project) {
- d->projectFinder.setProjectFiles(project->files(Project::ExcludeGeneratedFiles));
+ d->projectFinder.setProjectFiles(project->files(Project::SourceFiles));
d->projectFinder.setProjectDirectory(project->projectDirectory().toString());
connect(project, SIGNAL(fileListChanged()),
@@ -284,7 +284,7 @@ void QtOutputFormatter::openEditor(const QString &fileName, int line, int column
void QtOutputFormatter::updateProjectFileList()
{
if (d->project)
- d->projectFinder.setProjectFiles(d->project.data()->files(Project::ExcludeGeneratedFiles));
+ d->projectFinder.setProjectFiles(d->project.data()->files(Project::SourceFiles));
}
} // namespace QtSupport
diff --git a/src/plugins/todo/cpptodoitemsscanner.cpp b/src/plugins/todo/cpptodoitemsscanner.cpp
index 3239a0c9b7e..85612bd8b2f 100644
--- a/src/plugins/todo/cpptodoitemsscanner.cpp
+++ b/src/plugins/todo/cpptodoitemsscanner.cpp
@@ -59,7 +59,7 @@ void CppTodoItemsScanner::scannerParamsChanged()
QSet<QString> filesToBeUpdated;
foreach (const CppTools::ProjectInfo &info, modelManager->projectInfos())
- filesToBeUpdated.unite(info.project().data()->files(ProjectExplorer::Project::ExcludeGeneratedFiles).toSet());
+ filesToBeUpdated.unite(info.project().data()->files(ProjectExplorer::Project::SourceFiles).toSet());
modelManager->updateSourceFiles(filesToBeUpdated);
}
diff --git a/src/plugins/todo/todoitemsprovider.cpp b/src/plugins/todo/todoitemsprovider.cpp
index 2fd6a8d27d6..e295108b641 100644
--- a/src/plugins/todo/todoitemsprovider.cpp
+++ b/src/plugins/todo/todoitemsprovider.cpp
@@ -124,7 +124,7 @@ void TodoItemsProvider::createScanners()
void TodoItemsProvider::setItemsListWithinStartupProject()
{
QHashIterator<QString, QList<TodoItem> > it(m_itemsHash);
- QSet<QString> fileNames = QSet<QString>::fromList(m_startupProject->files(Project::ExcludeGeneratedFiles));
+ QSet<QString> fileNames = QSet<QString>::fromList(m_startupProject->files(Project::SourceFiles));
QVariantMap settings = m_startupProject->namedSettings(QLatin1String(Constants::SETTINGS_NAME_KEY)).toMap();
@@ -161,7 +161,7 @@ void TodoItemsProvider::setItemsListWithinSubproject()
QSet<Utils::FileName> subprojectFileNames =
QSet<Utils::FileName>::fromList(filesVisitor.filePaths());
QSet<QString> fileNames = QSet<QString>::fromList(
- m_startupProject->files(ProjectExplorer::Project::ExcludeGeneratedFiles));
+ m_startupProject->files(ProjectExplorer::Project::SourceFiles));
QHashIterator<QString, QList<TodoItem> > it(m_itemsHash);
while (it.hasNext()) {
it.next();
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 20bc29f24fa..7c80b53a083 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -743,7 +743,7 @@ void VcsBaseSubmitEditor::filterUntrackedFilesOfProject(const QString &repositor
return;
const QSet<QString> projectFiles
- = QSet<QString>::fromList(vcsProject->files(ProjectExplorer::Project::ExcludeGeneratedFiles));
+ = QSet<QString>::fromList(vcsProject->files(ProjectExplorer::Project::SourceFiles));
if (projectFiles.empty())
return;
--
GitLab