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

Fix: Switch Between Method Declaration/Definition issue when has implementation in header file

Browse Source 
Task-number: QTCREATORBUG-8393

Change-Id: Ie390e3151e6edc68287e5e0241365d128e6e2c4c
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
raidsan
2012-12-07 18:41:09 +08:00
committed by Erik Verbruggen
parent 352f6d6c4b
commit 45ec1bbe4a
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1120,18 +1120,20 @@ void CPPEditorWidget::switchDeclarationDefinition()
foreach (const LookupItem &r, declarations) { foreach (const LookupItem &r, declarations) {
if (Symbol *decl = r.declaration()) { if (Symbol *decl = r.declaration()) {
if (Function *funTy = decl->type()->asFunctionType()) { if (Function *funTy = decl->type()->asFunctionType()) {
if (funTy->isEqualTo(function) && decl != function && binding == r.binding()) if (funTy->isEqualTo(function)) {
if (decl != function && binding == r.binding())
best.prepend(decl); best.prepend(decl);
else else
best.append(decl); best.append(decl);
} }
} }
} }
}
if (! best.isEmpty()) if (! best.isEmpty())
openCppEditorAt(linkToSymbol(best.first())); openCppEditorAt(linkToSymbol(best.first()));
} else if (lastVisibleSymbol && lastVisibleSymbol->isDeclaration() && lastVisibleSymbol->type()->isFunctionType()) { } else if (lastVisibleSymbol && lastVisibleSymbol->isDeclaration() && lastVisibleSymbol->type()->isFunctionType()) {
if (Symbol *def = symbolFinder()->findMatchingDefinition(lastVisibleSymbol, snapshot)) if (Symbol *def = symbolFinder()->findMatchingDefinition(lastVisibleSymbol, snapshot, true))
openCppEditorAt(linkToSymbol(def)); openCppEditorAt(linkToSymbol(def));
} }
} }

3
src/plugins/cpptools/symbolfinder.cpp
View File

@@ -158,6 +158,9 @@ Symbol *SymbolFinder::findMatchingDefinition(Symbol *declaration,
continue; // nothing to do continue; // nothing to do
foreach (Function *fun, result) { foreach (Function *fun, result) {
if (fun->unqualifiedName()->isDestructorNameId() != declaration->unqualifiedName()->isDestructorNameId())
continue;
const QList<LookupItem> declarations = context.lookup(fun->name(), fun->enclosingScope()); const QList<LookupItem> declarations = context.lookup(fun->name(), fun->enclosingScope());
if (declarations.isEmpty()) if (declarations.isEmpty())
continue; continue;