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

CompilationDatabase: Avoid an unneeded cast

Browse Source 
Change-Id: I8f6d0d83b25738c164e6e29c317840058fdd8bfe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-11-21 13:20:32 +01:00
parent e94e1f116e
commit fd8afd564f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
View File

@@ -376,7 +376,8 @@ void CompilationDatabaseBuildSystem::triggerParsing()
void CompilationDatabaseBuildSystem::buildTreeAndProjectParts() void CompilationDatabaseBuildSystem::buildTreeAndProjectParts()
{ {
ProjectExplorer::KitInfo kitInfo(kit()); Kit *kit = target()->kit();
ProjectExplorer::KitInfo kitInfo(kit);
QTC_ASSERT(kitInfo.isValid(), return); QTC_ASSERT(kitInfo.isValid(), return);
// Reset toolchains to pick them based on the database entries. // Reset toolchains to pick them based on the database entries.
kitInfo.cToolChain = nullptr; kitInfo.cToolChain = nullptr;
@@ -386,7 +387,6 @@ void CompilationDatabaseBuildSystem::buildTreeAndProjectParts()
QTC_ASSERT(m_parser, return); QTC_ASSERT(m_parser, return);
const DbContents dbContents = m_parser->dbContents(); const DbContents dbContents = m_parser->dbContents();
const DbEntry *prevEntry = nullptr; const DbEntry *prevEntry = nullptr;
Kit *kit = static_cast<CompilationDatabaseProject *>(project())->kit();
for (const DbEntry &entry : dbContents.entries) { for (const DbEntry &entry : dbContents.entries) {
if (prevEntry && prevEntry->flags == entry.flags) { if (prevEntry && prevEntry->flags == entry.flags) {
rpps.back().files.append(entry.fileName.toString()); rpps.back().files.append(entry.fileName.toString());