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

Revert "C++: Fix completion for enum inside member functions"

Browse Source 
Breaks loading of qtcreator project.

This reverts commit 4c6ad5e305.

Change-Id: I7c4cdaf57eed16d7643d05b9456e03d5120259b3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-01-06 09:58:31 +01:00
parent 13c57348ac
commit 9180555f26
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/cplusplus/LookupContext.cpp
View File

@@ -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();
QHash<Block *, ClassOrNamespace *>::const_iterator citBlock = _blocks.find(block);
if (citBlock != _blocks.end())
return citBlock.value();
for (citBlock = binding->_blocks.begin(); citBlock != binding->_blocks.end(); ++citBlock) {
if (ClassOrNamespace *foundNestedBlock = citBlock.value()->findBlock(block))
return foundNestedBlock;
}
for (citBlock = _blocks.begin(); citBlock != _blocks.end(); ++citBlock) {
if (ClassOrNamespace *foundNestedBlock = citBlock.value()->findBlock(block))
return foundNestedBlock;
}
return 0;