diff options
author | Przemyslaw Gorszkowski <pgorszkowski@gmail.com> | 2013-01-29 15:19:50 +0100 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-01-29 17:33:42 +0100 |
commit | 7db3b660b64d5d6fa35b067e148d6807a089b209 (patch) | |
tree | f804b3a563208fa80befc7ffd5b3a509bf2577f9 /src/plugins/cpptools/cppchecksymbols.cpp | |
parent | f1cec4629e3a4d020b5372172d7adbdad6345898 (diff) | |
download | qt-creator-7db3b660b64d5d6fa35b067e148d6807a089b209.tar.gz |
C++ editor: Highlight member variable
Highlight member variable when there is also
enum value with the same name
Task-number: QTCREATORBUG-7525
Change-Id: I0990844a20fdf9e87a807fde10708344b9c3497b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppchecksymbols.cpp')
-rw-r--r-- | src/plugins/cpptools/cppchecksymbols.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp index 5f7b6f04d7..bc807c7f6c 100644 --- a/src/plugins/cpptools/cppchecksymbols.cpp +++ b/src/plugins/cpptools/cppchecksymbols.cpp @@ -787,7 +787,11 @@ void CheckSymbols::checkName(NameAST *ast, Scope *scope) } } } else if (maybeType(ast->name) || maybeStatic(ast->name)) { - maybeAddTypeOrStatic(_context.lookup(ast->name, scope), ast); + if (! maybeAddTypeOrStatic(_context.lookup(ast->name, scope), ast)) { + // it can be a local variable + if (maybeField(ast->name)) + maybeAddField(_context.lookup(ast->name, scope), ast); + } } else if (maybeField(ast->name)) { maybeAddField(_context.lookup(ast->name, scope), ast); } |