summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/LookupContext.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2010-05-20 12:13:44 +0200
committerErik Verbruggen <erik.verbruggen@nokia.com>2010-05-20 12:13:44 +0200
commit8d5dde66c0a1d9e46f68fddf96454ec4639c0407 (patch)
tree9382710d960ce2039ceca8c4e3dbe7ff8dc5d59c /src/libs/cplusplus/LookupContext.cpp
parent7f4cbe23832a6c7251152926ebd426b43253aa20 (diff)
downloadqt-creator-8d5dde66c0a1d9e46f68fddf96454ec4639c0407.tar.gz
Fixed qualified name creation for ObjC classes and protocols.
Also fixed the tests for it.
Diffstat (limited to 'src/libs/cplusplus/LookupContext.cpp')
-rw-r--r--src/libs/cplusplus/LookupContext.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index f5e6015947..29016a0d0a 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -63,9 +63,11 @@ static void fullyQualifiedName_helper(Symbol *symbol, QList<const Name *> *names
} else if (symbol->name()->isNameId() || symbol->name()->isTemplateNameId()) {
names->append(symbol->name());
-
}
-
+ } else if (symbol->isObjCClass() || symbol->isObjCBaseClass() || symbol->isObjCProtocol()
+ || symbol->isObjCForwardClassDeclaration() || symbol->isObjCForwardProtocolDeclaration()) {
+ if (symbol->name())
+ names->append(symbol->name());
} else if (symbol->isFunction()) {
if (const QualifiedNameId *q = symbol->name()->asQualifiedNameId()) {
for (unsigned i = 0; i < q->nameCount() - 1; ++i)
@@ -73,7 +75,6 @@ static void fullyQualifiedName_helper(Symbol *symbol, QList<const Name *> *names
}
}
}
-
}
bool ClassOrNamespace::CompareName::operator()(const Name *name, const Name *other) const