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

Return the class declaration as canonical symbol for ctors, dtors, and class names.

Browse Source
This commit is contained in:
Roberto Raggi
2009-10-06 16:27:39 +02:00
parent ef0e1a64dc
commit 3c51e5b24b
2 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -504,10 +504,29 @@ void LookupContext::expand(Scope *scope,
Symbol *LookupContext::canonicalSymbol(Symbol *symbol)
{
Symbol *canonical = symbol;
Class *canonicalClass = 0;
for (; symbol; symbol = symbol->next()) {
if (symbol->name() == canonical->name())
if (symbol->identifier() == canonical->identifier()) {
canonical = symbol;
if (Class *klass = symbol->asClass())
canonicalClass = klass;
}
}
if (canonicalClass) {
Q_ASSERT(canonical != 0);
if (canonical->isForwardClassDeclaration())
return canonicalClass; // prefer class declarations when available.
}
if (canonical && canonical->scope()->isClassScope()) {
Class *enclosingClass = canonical->scope()->owner()->asClass();
if (enclosingClass->identifier() == canonical->identifier())
return enclosingClass;
}
return canonical;