diff options
author | Orgad Shaneh <orgads@gmail.com> | 2015-01-06 09:58:31 +0100 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2015-01-06 10:02:12 +0100 |
commit | 9180555f260de05b2cb87ca6ff0586be63fff573 (patch) | |
tree | 8371bcb8cd8446b18c200b5b07d556b24823f403 /src/libs/cplusplus/LookupContext.cpp | |
parent | 13c57348ac1a26a1d2df56e8fdd84a7f267beefb (diff) | |
download | qt-creator-9180555f260de05b2cb87ca6ff0586be63fff573.tar.gz |
Revert "C++: Fix completion for enum inside member functions"
Breaks loading of qtcreator project.
This reverts commit 4c6ad5e3055cc4028920828ccad428dca4329766.
Change-Id: I7c4cdaf57eed16d7643d05b9456e03d5120259b3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src/libs/cplusplus/LookupContext.cpp')
-rw-r--r-- | src/libs/cplusplus/LookupContext.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 1a0b4ec75a..fefe1ecd5e 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -824,15 +824,13 @@ ClassOrNamespace *ClassOrNamespace::findBlock(Block *block) { flush(); - for (ClassOrNamespace *binding = this; binding; binding = binding->_parent) { - QHash<Block *, ClassOrNamespace *>::const_iterator citBlock = binding->_blocks.find(block); - if (citBlock != binding->_blocks.end()) - return citBlock.value(); - - for (citBlock = binding->_blocks.begin(); citBlock != binding->_blocks.end(); ++citBlock) { - if (ClassOrNamespace *foundNestedBlock = citBlock.value()->findBlock(block)) - return foundNestedBlock; - } + QHash<Block *, ClassOrNamespace *>::const_iterator citBlock = _blocks.find(block); + if (citBlock != _blocks.end()) + return citBlock.value(); + + for (citBlock = _blocks.begin(); citBlock != _blocks.end(); ++citBlock) { + if (ClassOrNamespace *foundNestedBlock = citBlock.value()->findBlock(block)) + return foundNestedBlock; } return 0; |