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

Clean up ClassOrNamespace::nestedType

Browse Source 
Remove unused code

Change-Id: I5d00acccf1d453cf08fbd4981d16bc12283437f1
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Przemyslaw Gorszkowski
2012-10-10 07:49:43 +02:00
committed by hjk
parent 19e03b186a
commit 0a5e392a59
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);