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

C++ function signature: Abort on unexpected function name.

Browse Source 
Change-Id: Iaaa3907f709ea9ed567f59725399efd9024f3bc0
Reviewed-on: http://codereview.qt-project.org/5319
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
This commit is contained in:
Christian Kamm
2011-09-21 14:39:48 +02:00
parent 95590db0b8
commit 9cc4751857
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/cppeditor/cppfunctiondecldeflink.cpp
View File

@@ -510,15 +510,22 @@ Utils::ChangeSet FunctionDeclDefLink::changes(const Snapshot &snapshot, int targ
if (!newFunction) if (!newFunction)
return changes; return changes;
LookupContext sourceContext(sourceDocument, snapshot);
LookupContext targetContext(targetFile->cppDocument(), snapshot);
Overview overview; Overview overview;
overview.setShowReturnTypes(true); overview.setShowReturnTypes(true);
overview.setShowTemplateParameters(true); overview.setShowTemplateParameters(true);
overview.setShowArgumentNames(true); overview.setShowArgumentNames(true);
overview.setShowFunctionSignatures(true); overview.setShowFunctionSignatures(true);
// abort if the name of the newly parsed function is not the expected one
DeclaratorIdAST *newDeclId = getDeclaratorId(newDef->declarator);
if (!newDeclId || !newDeclId->name || !newDeclId->name->name
|| overview(newDeclId->name->name) != nameInitial) {
return changes;
}
LookupContext sourceContext(sourceDocument, snapshot);
LookupContext targetContext(targetFile->cppDocument(), snapshot);
// sync return type // sync return type
{ {
// set up for rewriting return type // set up for rewriting return type