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

ProjectExplorer: Shorten space needed to store a FileType

Browse Source 
Use class enum to shorten the FileType to quint16. This frees up a couple
of bytes per FileNode and we can have many of those.

Change-Id: I3a9ae25059690fefa15305a4268269647d6dc1c9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2016-10-31 13:47:42 +01:00
parent c9ee7ee378
commit ce3e586198
19 changed files with 84 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,7 +437,7 @@ 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, ProjectFileType, false));
m_cmakeFileList.append( new FileNode(fileName, FileType::Project, false));
} else {
bool generated = false;
QString onlyFileName = fileName.fileName();
@@ -447,9 +447,9 @@ void CMakeCbpParser::parseUnit()
generated = true;
if (fileName.endsWith(".qrc"))
m_fileList.append( new FileNode(fileName, ResourceType, generated));
m_fileList.append( new FileNode(fileName, FileType::Resource, generated));
else
m_fileList.append( new FileNode(fileName, SourceType, generated));
m_fileList.append( new FileNode(fileName, FileType::Source, generated));
}
m_unitTargetMap.insert(fileName, m_unitTargets);
m_processedUnits.insert(fileName);

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

@@ -224,7 +224,7 @@ void ServerModeReader::generateProjectTree(CMakeProjectNode *root)
const int oldCount = knownFiles.count();
knownFiles.insert(s);
if (oldCount != knownFiles.count())
fileGroupNodes.append(new FileNode(s, SourceType, fg->isGenerated));
fileGroupNodes.append(new FileNode(s, FileType::Source, fg->isGenerated));
}
}
root->buildTree(fileGroupNodes);
@@ -418,7 +418,7 @@ void ServerModeReader::extractCMakeInputsData(const QVariantMap &data)
const int oldCount = m_cmakeFiles.count();
m_cmakeFiles.insert(sfn);
if (!isCMake && oldCount < m_cmakeFiles.count())
m_cmakeInputsFileNodes.append(new FileNode(sfn, ProjectFileType, isTemporary));
m_cmakeInputsFileNodes.append(new FileNode(sfn, FileType::Project, isTemporary));
}
}
}

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

@@ -418,7 +418,7 @@ void TeaLeafReader::extractData()
resetData();
m_projectName = m_parameters.projectName;
m_files.append(new FileNode(topCMake, ProjectFileType, false));
m_files.append(new FileNode(topCMake, FileType::Project, false));
// Do not insert topCMake into m_cmakeFiles: The project already watches that!
// Find cbp file
@@ -450,7 +450,7 @@ void TeaLeafReader::extractData()
// Make sure the top cmakelists.txt file is always listed:
if (!contains(m_files, [topCMake](FileNode *fn) { return fn->filePath() == topCMake; })) {
m_files.append(new FileNode(topCMake, ProjectFileType, false));
m_files.append(new FileNode(topCMake, FileType::Project, false));
}
m_buildTargets = cbpparser.buildTargets();