shiboken: Fix non-deterministic order of some SBK type indexes

Change underlying type of the type database from
a QHash<qualified_name, list of entries> to
a QMultiMap<qualified_name, entry>.

Previously, there was an allEntries() accessor and a function
named entries() building a QHash<qualified_name, entry>.
Simplify this so that there is only an entries() accessor
returning the QMultiMap.

Refactor the various Typedatabase::find() functions to operate on an
iterator range of the QMultiMap.

This unearthed some bugs:

1) In the generators, the call to findType(packageName()) would return
   the namespace entry for "sample" instead of the intended
   module type entry named "sample" due to the ordering.

   Add a new function to search for module type entries and assert
   that it finds it.

2) There was a duplicate, empty primitive type entry for
   QModelIndexList.

Task-number: PYSIDE-757
Change-Id: I1814e4ca67d306e1488398507707cfd07b3f2c78
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 8 insertions, 11 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 5a2f75f31..ee1b690b7 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -187,10 +187,9 @@ static QString msgNoFunctionForModification(const QString &signature,
 
 void AbstractMetaBuilderPrivate::checkFunctionModifications()
 {
-    TypeDatabase *types = TypeDatabase::instance();
-    const SingleTypeEntryHash entryHash = types->entries();
+    const auto &entries = TypeDatabase::instance()->entries();
 
-    for (SingleTypeEntryHash::const_iterator it = entryHash.cbegin(), end = entryHash.cend(); it != end; ++it) {
+    for (auto it = entries.cbegin(), end = entries.cend(); it != end; ++it) {
         const TypeEntry *entry = it.value();
         if (!entry)
             continue;
@@ -580,13 +579,11 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom)
         if (cls->isAbstract() && !cls->isInterface())
             cls->typeEntry()->setLookupName(cls->typeEntry()->targetLangName() + QLatin1String("$ConcreteWrapper"));
     }
-    const TypeEntryHash allEntries = types->allEntries();
+    const auto &allEntries = types->entries();
     ReportHandler::progress(QLatin1String("Detecting inconsistencies in typesystem..."));
-    for (TypeEntryHash::const_iterator it = allEntries.cbegin(), end = allEntries.cend(); it != end; ++it) {
-        for (TypeEntry *entry : it.value()) {
-            if (entry->isPrimitive())
-                continue;
-
+    for (auto it = allEntries.cbegin(), end = allEntries.cend(); it != end; ++it) {
+        TypeEntry *entry = it.value();
+        if (!entry->isPrimitive()) {
             if ((entry->isValue() || entry->isObject())
                 && !entry->isString()
                 && !entry->isChar()
@@ -2183,8 +2180,8 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const AddedFunction:
 
     if (!type) {
         QStringList candidates;
-        SingleTypeEntryHash entries = typeDb->entries();
-        for (SingleTypeEntryHash::const_iterator it = entries.cbegin(), end = entries.cend(); it != end; ++it) {
+        const auto &entries = typeDb->entries();
+        for (auto it = entries.cbegin(), end = entries.cend(); it != end; ++it) {
             // Let's try to find the type in different scopes.
             if (it.key().endsWith(colonColon() + typeName))
                 candidates.append(it.key());