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

C++: Avoid duplicate entries in TypeResolver

Browse Source 
Change-Id: I094dc04a14c05b17815d53bf0170926cc0c0d2a5
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
This commit is contained in:
Orgad Shaneh
2015-04-24 11:12:11 +03:00
committed by Orgad Shaneh
parent 5e0f0268ae
commit d9eab81cbb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/cplusplus/TypeResolver.cpp
View File

@@ -79,8 +79,10 @@ QList<LookupItem> TypeResolver::getNamedTypeItems(const Name *name, Scope *scope
if (namedTypeItems.isEmpty()) {
if (binding)
namedTypeItems = binding->lookup(name);
if (LookupScope *scopeCon = _context.lookupType(scope))
namedTypeItems += scopeCon->lookup(name);
if (LookupScope *scopeCon = _context.lookupType(scope)) {
if (scopeCon != binding)
namedTypeItems += scopeCon->lookup(name);
}
}
return namedTypeItems;