feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Remove FileNode's isGenerated constructor bool

Browse Source 
Use setter of base class, similar to setListInProject() before.

Change-Id: Id620f0084a5dec0410f29c80f8f6393a6bcd5050
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2019-02-25 12:08:58 +01:00
parent 15673b6eca
commit 09372918c1
20 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cmakeprojectmanager/cmakecbpparser.cpp
View File

@@ -429,7 +429,7 @@ void CMakeCbpParser::parseUnit()
// Now check whether we found a virtual element beneath
if (m_parsingCMakeUnit) {
m_cmakeFileList.emplace_back(
std::make_unique<FileNode>(fileName, FileType::Project, false));
std::make_unique<FileNode>(fileName, FileType::Project));
} else {
bool generated = false;
QString onlyFileName = fileName.fileName();
@@ -440,13 +440,12 @@ void CMakeCbpParser::parseUnit()
if (fileName.endsWith(".qrc")) {
m_fileList.emplace_back(
std::make_unique<FileNode>(fileName, FileType::Resource,
generated));
std::make_unique<FileNode>(fileName, FileType::Resource));
} else {
m_fileList.emplace_back(
std::make_unique<FileNode>(fileName, FileType::Source,
generated));
std::make_unique<FileNode>(fileName, FileType::Source));
}
m_fileList.back()->setIsGenerated(generated);
}
m_unitTargetMap.insert(fileName, m_unitTargets);
m_processedUnits.insert(fileName);

7
src/plugins/cmakeprojectmanager/servermodereader.cpp
View File

@@ -702,7 +702,8 @@ void ServerModeReader::extractCMakeInputsData(const QVariantMap &data)
// Always include CMakeLists.txt files, even when cmake things these are part of its
// stuff. This unbreaks cmake binaries running from their own build directory.
m_cmakeInputsFileNodes.emplace_back(
std::make_unique<FileNode>(sfn, FileType::Project, isTemporary));
std::make_unique<FileNode>(sfn, FileType::Project));
m_cmakeInputsFileNodes.back()->setIsGenerated(isTemporary);
}
}
}
@@ -908,8 +909,8 @@ void ServerModeReader::addFileGroups(ProjectNode *targetRoot,
std::vector<std::unique_ptr<FileNode>> newFileNodes
= Utils::transform<std::vector>(newSources,
[f, &knownHeaderNodes](const Utils::FileName &fn) {
auto node
= std::make_unique<FileNode>(fn, Node::fileTypeForFileName(fn), f->isGenerated);
auto node = std::make_unique<FileNode>(fn, Node::fileTypeForFileName(fn));
node->setIsGenerated(f->isGenerated);
if (node->fileType() == FileType::Header)
knownHeaderNodes.append(node.get());
return node;

4
src/plugins/cmakeprojectmanager/tealeafreader.cpp
View File

@@ -422,7 +422,7 @@ void TeaLeafReader::extractData()
resetData();
m_projectName = m_parameters.projectName;
m_files.emplace_back(std::make_unique<FileNode>(topCMake, FileType::Project, false));
m_files.emplace_back(std::make_unique<FileNode>(topCMake, FileType::Project));
// Do not insert topCMake into m_cmakeFiles: The project already watches that!
// Find cbp file
@@ -458,7 +458,7 @@ void TeaLeafReader::extractData()
if (!contains(m_files, [topCMake](const std::unique_ptr<FileNode> &fn) {
return fn->filePath() == topCMake;
}))
m_files.emplace_back(std::make_unique<FileNode>(topCMake, FileType::Project, false));
m_files.emplace_back(std::make_unique<FileNode>(topCMake, FileType::Project));
m_buildTargets = cbpparser.buildTargets();
}

2
src/plugins/cmakeprojectmanager/treescanner.cpp
View File

@@ -166,7 +166,7 @@ void TreeScanner::scanForFiles(FutureInterface *fi, const Utils::FileName& direc
if (factory)
type = factory(mimeType, fn);
return new FileNode(fn, type, false);
return new FileNode(fn, type);
}, fip.get());
Utils::sort(nodes, ProjectExplorer::Node::sortByPath);