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

Skip constructors and destructors when searching for the canonical symbol.

Browse Source
This commit is contained in:
Roberto Raggi
2010-08-17 16:09:24 +02:00
parent 9c1fc97a1f
commit 4eb40af9a8
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -344,18 +344,24 @@ struct CanonicalSymbol
for (int i = results.size() - 1; i != -1; --i) { for (int i = results.size() - 1; i != -1; --i) {
const LookupItem &r = results.at(i); const LookupItem &r = results.at(i);
Symbol *decl = r.declaration();
if (! r.declaration()) if (! (decl && decl->scope()))
break;
else if (! r.declaration()->scope())
break;
else if (! r.declaration()->scope()->isClass())
break; break;
if (Function *funTy = r.declaration()->type()->asFunctionType()) if (Class *classScope = r.declaration()->scope()->asClass()) {
const Identifier *declId = decl->identifier();
const Identifier *classId = classScope->identifier();
if (classId && classId->isEqualTo(declId))
continue; // skip it, it's a ctor or a dtor.
else if (Function *funTy = r.declaration()->type()->asFunctionType()) {
if (funTy->isVirtual()) if (funTy->isVirtual())
return r.declaration(); return r.declaration();
} }
}
}
for (int i = 0; i < results.size(); ++i) { for (int i = 0; i < results.size(); ++i) {
const LookupItem &r = results.at(i); const LookupItem &r = results.at(i);