aboutsummaryrefslogtreecommitdiffstats
path: root/typedatabase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'typedatabase.cpp')
-rw-r--r--typedatabase.cpp23
1 files changed, 4 insertions, 19 deletions
diff --git a/typedatabase.cpp b/typedatabase.cpp
index 1247bf7f..d5c1eb6c 100644
--- a/typedatabase.cpp
+++ b/typedatabase.cpp
@@ -141,29 +141,14 @@ PrimitiveTypeEntry* TypeDatabase::findTargetLangPrimitiveType(const QString& tar
TypeEntry* TypeDatabase::findType(const QString& name) const
{
- TypeEntry* typeEntry = 0;
- QList<TypeEntry *> typeEntries = findTypes(name);
-
- if (typeEntries.isEmpty()) {
- SingleTypeEntryHash entriesHash = entries();
- foreach (QString typeName, entriesHash.keys()) {
- // Let's try to find the type in different scopes.
- // We will prefer the ones with the least depth.
- if (typeName.endsWith("::"+name)
- && (!typeEntry || typeEntry->qualifiedCppName().count("::") < typeName.count("::"))) {
- typeEntry = entriesHash[typeName];
- }
- }
- }
-
- foreach (TypeEntry* entry, typeEntries) {
+ QList<TypeEntry *> entries = findTypes(name);
+ foreach (TypeEntry *entry, entries) {
if (entry &&
(!entry->isPrimitive() || static_cast<PrimitiveTypeEntry *>(entry)->preferredTargetLangType())) {
- typeEntry = entry;
- break;
+ return entry;
}
}
- return typeEntry;
+ return 0;
}
SingleTypeEntryHash TypeDatabase::entries() const