From 7db3b660b64d5d6fa35b067e148d6807a089b209 Mon Sep 17 00:00:00 2001 From: Przemyslaw Gorszkowski Date: Tue, 29 Jan 2013 15:19:50 +0100 Subject: 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 Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/cppchecksymbols.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/plugins/cpptools/cppchecksymbols.cpp') 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); } -- cgit v1.2.1