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

Prefer ObjC classes/protocols when searching for a canonical symbol.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-01-10 17:54:59 +01:00
parent 0c17d53875
commit 2dc221d76d
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/cplusplus/LookupContext.cpp
View File

@@ -727,6 +727,8 @@ Symbol *LookupContext::canonicalSymbol(Symbol *symbol)
{
Symbol *canonical = symbol;
Class *canonicalClass = 0;
ObjCClass *canonicalObjCClass = 0;
ObjCProtocol *canonicalObjCProto = 0;
for (; symbol; symbol = symbol->next()) {
if (symbol->identifier() == canonical->identifier()) {
@@ -734,6 +736,10 @@ Symbol *LookupContext::canonicalSymbol(Symbol *symbol)
if (Class *klass = symbol->asClass())
canonicalClass = klass;
else if (ObjCClass *clazz = symbol->asObjCClass())
canonicalObjCClass = clazz;
else if (ObjCProtocol *proto = symbol->asObjCProtocol())
canonicalObjCProto = proto;
}
}
@@ -742,6 +748,16 @@ Symbol *LookupContext::canonicalSymbol(Symbol *symbol)
if (canonical->isForwardClassDeclaration())
return canonicalClass; // prefer class declarations when available.
} else if (canonicalObjCClass) {
Q_ASSERT(canonical != 0);
if (canonical->isObjCForwardClassDeclaration())
return canonicalObjCClass;
} else if (canonicalObjCProto) {
Q_ASSERT(canonical != 0);
if (canonical->isObjCForwardProtocolDeclaration())
return canonicalObjCProto;
}
if (canonical && canonical->scope()->isClassScope()) {