diff options
author | Przemyslaw Gorszkowski <pgorszkowski@gmail.com> | 2012-10-10 07:49:43 +0200 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2012-10-31 15:43:30 +0100 |
commit | 0a5e392a59c3bdfd19ce94ad4c47d89608f690c3 (patch) | |
tree | 5996835987eaef2d57eaf5d3c1f421eca7010268 /src/libs/cplusplus/LookupContext.cpp | |
parent | 19e03b186a976188992eab1feb3ddf0ae99e2236 (diff) | |
download | qt-creator-0a5e392a59c3bdfd19ce94ad4c47d89608f690c3.tar.gz |
Clean up ClassOrNamespace::nestedType
Remove unused code
Change-Id: I5d00acccf1d453cf08fbd4981d16bc12283437f1
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/libs/cplusplus/LookupContext.cpp')
-rw-r--r-- | src/libs/cplusplus/LookupContext.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 4b2748f7fe..1645d79961 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -852,20 +852,11 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, ClassOrNamespac if (allBases.isEmpty() || allBases.size() == knownUsings.size()) return reference; - QList<const Name *> fullyQualifiedNameForReferenceClass = - LookupContext::fullyQualifiedName(referenceClass); // Find the missing bases for regular (non-template) types. // Ex.: class A : public B<Some>::Type {}; foreach (const Name *baseName, allBases) { ClassOrNamespace *binding = this; if (const QualifiedNameId *qBaseName = baseName->asQualifiedNameId()) { - QList<const Name *> fullyQualifiedNameForBaseClass; - addNames(baseName, &fullyQualifiedNameForBaseClass); - if (compareFullyQualifiedName(fullyQualifiedNameForReferenceClass, - fullyQualifiedNameForBaseClass)) { - continue; - } - if (const Name *qualification = qBaseName->base()) binding = lookupType(qualification); else if (binding->parent() != 0) @@ -877,9 +868,6 @@ ClassOrNamespace *ClassOrNamespace::nestedType(const Name *name, ClassOrNamespac continue; baseName = qBaseName->name(); } - else if (compareName(name, baseName)) { - continue; - } if (binding) { ClassOrNamespace * baseBinding = binding->lookupType(baseName); |