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

CMake: Only pass the path mapper to the cbp-parser

Browse Source 
No need to pass in the complete kit. Remove a couple of unnecessary
namespace names.

Change-Id: I2ac895535a80b4a54a423ce62dbdede65b67437b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-10-13 11:36:00 +02:00
parent fe23c71414
commit b1433e2a05
5 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@
#pragma once
#include "cmakeproject.h"
#include "cmaketool.h"
#include <utils/fileutils.h>
@@ -46,7 +47,7 @@ namespace Internal {
class CMakeCbpParser : public QXmlStreamReader
{
public:
bool parseCbpFile(const ProjectExplorer::Kit *const kit, const QString &fileName,
bool parseCbpFile(CMakeTool::PathMapper mapper, const QString &fileName,
const QString &sourceDirectory);
QList<ProjectExplorer::FileNode *> fileList();
QList<ProjectExplorer::FileNode *> cmakeFileList();
@@ -73,7 +74,7 @@ private:
void sortFiles();
QMap<Utils::FileName, QStringList> m_unitTargetMap;
const ProjectExplorer::Kit *m_kit = 0;
CMakeTool::PathMapper m_pathMapper;
QList<ProjectExplorer::FileNode *> m_fileList;
QList<ProjectExplorer::FileNode *> m_cmakeFileList;
QSet<Utils::FileName> m_processedUnits;