shiboken/Typedatabase: Store type system entries separately

This makes it easier to access the default type system entry,
which will always be the first one in the list.

Change-Id: Ie0844cef5fa4f0cd8bc50c28898e54a42845c830
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

1 files changed, 6 insertions, 12 deletions

diff --git a/sources/shiboken2/generator/generator.cpp b/sources/shiboken2/generator/generator.cpp
index ec227bd83..154a16ed3 100644
--- a/sources/shiboken2/generator/generator.cpp
+++ b/sources/shiboken2/generator/generator.cpp
@@ -176,19 +176,13 @@ Generator::~Generator()
 bool Generator::setup(const ApiExtractor& extractor)
 {
     m_d->apiextractor = &extractor;
-    const auto &allEntries = TypeDatabase::instance()->entries();
-    TypeEntry* entryFound = 0;
-    for (auto it = allEntries.cbegin(), end = allEntries.cend(); it != end; ++it) {
-        TypeEntry *entry = it.value();
-        if (entry->type() == TypeEntry::TypeSystemType && entry->generateCode()) {
-            entryFound = entry;
-            break;
-        }
-    }
-    if (entryFound)
-        m_d->packageName = entryFound->name();
-    else
+    const auto moduleEntry = TypeDatabase::instance()->defaultTypeSystemType();
+    if (!moduleEntry || !moduleEntry->generateCode()) {
         qCWarning(lcShiboken) << "Couldn't find the package name!!";
+        return false;
+    }
+
+    m_d->packageName = moduleEntry->name();
 
     collectInstantiatedContainersAndSmartPointers();