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

Fixed: "Follow symbol" on constructor or destructor always jumps to class definition

Browse Source 
Task-number: QTCREATORBUG-1776
This commit is contained in:
Roberto Raggi
2010-07-05 13:34:27 +02:00
parent d209bd72db
commit 76ebb46479
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -703,25 +703,17 @@ public:
};
} // end of anonymous namespace
Symbol *Snapshot::findMatchingDefinition(Symbol *symbol) const
Symbol *Snapshot::findMatchingDefinition(Symbol *declaration) const
{
if (! symbol->identifier())
if (! (declaration && declaration->identifier()))
return 0;
Document::Ptr thisDocument = document(QString::fromUtf8(symbol->fileName(), symbol->fileNameLength()));
Document::Ptr thisDocument = document(QString::fromUtf8(declaration->fileName(), declaration->fileNameLength()));
if (! thisDocument) {
qWarning() << "undefined document:" << symbol->fileName();
qWarning() << "undefined document:" << declaration->fileName();
return 0;
}
LookupContext thisContext(thisDocument, *this);
const QList<Symbol *> declarationCandidates = thisContext.lookup(symbol->name(), symbol->scope());
if (declarationCandidates.isEmpty()) {
qWarning() << "unresolved declaration:" << symbol->fileName() << symbol->line() << symbol->column();
return 0;
}
Symbol *declaration = declarationCandidates.first();
Function *declarationTy = declaration->type()->asFunctionType();
if (! declarationTy) {
qWarning() << "not a function:" << declaration->fileName() << declaration->line() << declaration->column();