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

Flush the current binding before searching for types.

Browse Source
This commit is contained in:
Roberto Raggi
2010-05-14 15:32:40 +02:00
parent 81d7ac2d69
commit 25b04ff5b4
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -448,27 +448,25 @@ ClassOrNamespace *ClassOrNamespace::lookupType_helper(const Name *name,
QSet<ClassOrNamespace *> *processed,
bool searchInEnclosingScope)
{
Q_ASSERT(name != 0);
if (const QualifiedNameId *q = name->asQualifiedNameId()) {
ClassOrNamespace *e = this;
if (! processed->contains(this)) {
if (q->isGlobal())
e = globalNamespace();
e = e->lookupType(q->nameAt(0));
for (unsigned index = 1; e && index < q->nameCount(); ++index)
e = e->findType(q->nameAt(index));
return e;
} else if (! processed->contains(this)) {
processed->insert(this);
if (const QualifiedNameId *q = name->asQualifiedNameId()) {
ClassOrNamespace *e = this;
if (name->isNameId() || name->isTemplateNameId()) {
flush();
if (q->isGlobal())
e = globalNamespace();
e = e->lookupType(q->nameAt(0));
for (unsigned index = 1; e && index < q->nameCount(); ++index) {
QSet<ClassOrNamespace *> processed;
e = e->lookupType_helper(q->nameAt(index), &processed, /*searchInEnclosingScope =*/ false);
}
return e;
} else if (name->isNameId() || name->isTemplateNameId()) {
if (ClassOrNamespace *e = nestedType(name))
return e;