shiboken: Refactor finding of enums

In the AbstractMetaBuilder, change the list of enums into a QHash with the type entry as key
since that is mostly used for searching. Streamline and simplify
the search functionality accordingly.

Task-number: PYSIDE-817
Change-Id: I205cad1f90bc26511ea6b6e9b76ddb1bae544cf1
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 69b9ac7df..9653831cc 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -160,6 +160,13 @@ AbstractMetaEnumList AbstractMetaBuilder::globalEnums() const
     return d->m_globalEnums;
 }
 
+AbstractMetaEnum *AbstractMetaBuilder::findEnum(const TypeEntry *typeEntry) const
+{
+    if (typeEntry && typeEntry->isFlags())
+        typeEntry = static_cast<const FlagsTypeEntry*>(typeEntry)->originator();
+    return d->m_enums.value(typeEntry);
+}
+
 void AbstractMetaBuilderPrivate::checkFunctionModifications()
 {
     const auto &entries = TypeDatabase::instance()->entries();
@@ -595,17 +602,10 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom)
                 const QString name = static_cast<const EnumTypeEntry *>(entry)->targetLangQualifier();
                 AbstractMetaClass *cls = AbstractMetaClass::findClass(m_metaClasses, name);
 
-                bool enumFound = false;
-                if (cls) {
-                    enumFound = cls->findEnum(entry->targetLangName());
-                } else { // Global enum
-                    for (AbstractMetaEnum *metaEnum : qAsConst(m_enums)) {
-                        if (metaEnum->typeEntry() == entry) {
-                            enumFound = true;
-                            break;
-                        }
-                    }
-                }
+                const bool enumFound = cls
+                    ? cls->findEnum(entry->targetLangName()) != nullptr
+                    : m_enums.contains(entry);
+
                 if (!enumFound) {
                     entry->setCodeGeneration(TypeEntry::GenerateNothing);
                     qCWarning(lcShiboken).noquote().nospace()
@@ -946,7 +946,7 @@ AbstractMetaEnum *AbstractMetaBuilderPrivate::traverseEnum(const EnumModelItem &
         }
     }
 
-    m_enums << metaEnum;
+    m_enums.insert(typeEntry, metaEnum);
 
     if (!metaEnum->typeEntry()->include().isValid())
         setInclude(metaEnum->typeEntry(), enumItem->fileName());