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

Handle shadow declarations.

Browse Source
This commit is contained in:
Roberto Raggi
2010-07-20 10:44:07 +02:00
parent 33b19f0210
commit 89cc8993c9
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cppeditor/cppquickfix.cpp
View File

@@ -1513,7 +1513,20 @@ public:
if (binary->left_expression && binary->right_expression && tokenAt(binary->binary_op_token).is(T_EQUAL)) {
if (isCursorOn(binary->left_expression) && binary->left_expression->asSimpleName() != 0) {
SimpleNameAST *nameAST = binary->left_expression->asSimpleName();
if (context().lookup(nameAST->name, scopeAt(nameAST->firstToken())).isEmpty()) {
const QList<LookupItem> results = context().lookup(nameAST->name, scopeAt(nameAST->firstToken()));
Declaration *decl = 0;
foreach (const LookupItem &r, results) {
if (! r.declaration())
continue;
else if (Declaration *d = r.declaration()->asDeclaration()) {
if (! d->type()->isFunctionType()) {
decl = d;
break;
}
}
}
if (! decl) {
binaryAST = binary;
typeOfExpression.init(document(), snapshot(), context().bindings());
return index;