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

ProjectExplorer: Add FolderNode::addNestedNodes taking unique_ptrs

Browse Source 
Use that in CMake's tealeafreader.

Change-Id: Id1c372b083df380d0d930668cf7eec4ee89060c2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Tobias Hunger
2018-04-26 16:39:15 +02:00
parent 1a23768563
commit bdd2dd371e
7 changed files with 56 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,11 +61,11 @@ int distance(const FileName &targetDirectory, const FileName &fileName)
void CMakeCbpParser::sortFiles()
{
QLoggingCategory log("qtc.cmakeprojectmanager.filetargetmapping");
FileNameList fileNames = transform(m_fileList, &FileNode::filePath);
FileNameList fileNames = transform<QList>(m_fileList, &FileNode::filePath);
sort(fileNames);
CMakeBuildTarget *last = 0;
CMakeBuildTarget *last = nullptr;
FileName parentDirectory;
qCDebug(log) << "###############";
@@ -428,7 +428,8 @@ void CMakeCbpParser::parseUnit()
if (!fileName.endsWith(".rule") && !m_processedUnits.contains(fileName)) {
// Now check whether we found a virtual element beneath
if (m_parsingCMakeUnit) {
m_cmakeFileList.append( new FileNode(fileName, FileType::Project, false));
m_cmakeFileList.emplace_back(
std::make_unique<FileNode>(fileName, FileType::Project, false));
} else {
bool generated = false;
QString onlyFileName = fileName.fileName();
@@ -437,10 +438,15 @@ void CMakeCbpParser::parseUnit()
|| (onlyFileName.startsWith("qrc_") && onlyFileName.endsWith(".cxx")))
generated = true;
if (fileName.endsWith(".qrc"))
m_fileList.append( new FileNode(fileName, FileType::Resource, generated));
else
m_fileList.append( new FileNode(fileName, FileType::Source, generated));
if (fileName.endsWith(".qrc")) {
m_fileList.emplace_back(
std::make_unique<FileNode>(fileName, FileType::Resource,
generated));
} else {
m_fileList.emplace_back(
std::make_unique<FileNode>(fileName, FileType::Source,
generated));
}
}
m_unitTargetMap.insert(fileName, m_unitTargets);
m_processedUnits.insert(fileName);
@@ -488,19 +494,9 @@ void CMakeCbpParser::parseUnknownElement()
}
}
QList<FileNode *> CMakeCbpParser::fileList()
{
return m_fileList;
}
QList<FileNode *> CMakeCbpParser::cmakeFileList()
{
return m_cmakeFileList;
}
bool CMakeCbpParser::hasCMakeFiles()
{
return !m_cmakeFileList.isEmpty();
return m_cmakeFileList.size() > 0;
}
QList<CMakeBuildTarget> CMakeCbpParser::buildTargets()