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

Create definition is available on the whole declaration line.

Browse Source 
Merge-request: 390
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

Change-Id: I046b3046d3d0148b0fad694181f17737e12a85b6
Reviewed-on: http://codereview.qt-project.org/5529
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
This commit is contained in:
Nicolas Arnaud-Cormos
2011-09-26 10:51:13 +02:00
committed by Christian Kamm
parent 9357b054ae
commit 9ceabbacfb
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,7 +293,6 @@ QList<CppQuickFixOperation::Ptr> DefFromDecl::match(
const QSharedPointer<const Internal::CppQuickFixAssistInterface> &interface)
{
const QList<AST *> &path = interface->path();
CppRefactoringFilePtr file = interface->currentFile();
int idx = path.size() - 1;
for (; idx >= 0; --idx) {
@@ -306,17 +305,14 @@ QList<CppQuickFixOperation::Ptr> DefFromDecl::match(
&& !decl->type()->asFunctionType()->isPureVirtual()
&& decl->enclosingScope()
&& decl->enclosingScope()->isClass()) {
DeclaratorAST *declarator = simpleDecl->declarator_list->value;
if (file->isCursorOn(declarator->core_declarator)) {
CppRefactoringChanges refactoring(interface->snapshot());
InsertionPointLocator locator(refactoring);
QList<CppQuickFixOperation::Ptr> results;
foreach (const InsertionLocation &loc, locator.methodDefinition(decl)) {
if (loc.isValid())
results.append(CppQuickFixOperation::Ptr(new InsertDefOperation(interface, idx, decl, loc)));
}
return results;
CppRefactoringChanges refactoring(interface->snapshot());
InsertionPointLocator locator(refactoring);
QList<CppQuickFixOperation::Ptr> results;
foreach (const InsertionLocation &loc, locator.methodDefinition(decl)) {
if (loc.isValid())
results.append(CppQuickFixOperation::Ptr(new InsertDefOperation(interface, idx, decl, loc)));
}
return results;
}
}
}