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

10
src/plugins/cmakeprojectmanager/cmakecbpparser.h
View File

@@ -48,8 +48,10 @@ class CMakeCbpParser : public QXmlStreamReader
public:
bool parseCbpFile(CMakeTool::PathMapper mapper, const Utils::FileName &fileName,
const Utils::FileName &sourceDirectory);
QList<ProjectExplorer::FileNode *> fileList();
QList<ProjectExplorer::FileNode *> cmakeFileList();
std::vector<std::unique_ptr<ProjectExplorer::FileNode>> &&
takeFileList() { return std::move(m_fileList); }
std::vector<std::unique_ptr<ProjectExplorer::FileNode>> &&
takeCmakeFileList() { return std::move(m_cmakeFileList); }
QList<CMakeBuildTarget> buildTargets();
QString projectName() const;
QString compilerName() const;
@@ -74,8 +76,8 @@ private:
QMap<Utils::FileName, QStringList> m_unitTargetMap;
CMakeTool::PathMapper m_pathMapper;
QList<ProjectExplorer::FileNode *> m_fileList;
QList<ProjectExplorer::FileNode *> m_cmakeFileList;
std::vector<std::unique_ptr<ProjectExplorer::FileNode>> m_fileList;
std::vector<std::unique_ptr<ProjectExplorer::FileNode>> m_cmakeFileList;
QSet<Utils::FileName> m_processedUnits;
bool m_parsingCMakeUnit = false;