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, 1 insertions, 33 deletions

diff --git a/sources/shiboken2/ApiExtractor/apiextractor.cpp b/sources/shiboken2/ApiExtractor/apiextractor.cpp
index 80ffc3910..775485c81 100644
--- a/sources/shiboken2/ApiExtractor/apiextractor.cpp
+++ b/sources/shiboken2/ApiExtractor/apiextractor.cpp
@@ -177,41 +177,9 @@ static const AbstractMetaEnum* findEnumOnClasses(AbstractMetaClassList metaClass
     return result;
 }
 
-const AbstractMetaEnum* ApiExtractor::findAbstractMetaEnum(const EnumTypeEntry* typeEntry) const
-{
-    if (!typeEntry)
-        return 0;
-    const AbstractMetaEnumList &globalEnums = m_builder->globalEnums();
-    for (AbstractMetaEnum* metaEnum : globalEnums) {
-        if (metaEnum->typeEntry() == typeEntry)
-            return metaEnum;
-    }
-    return findEnumOnClasses(m_builder->classes(), typeEntry);
-}
-
 const AbstractMetaEnum* ApiExtractor::findAbstractMetaEnum(const TypeEntry* typeEntry) const
 {
-    if (!typeEntry)
-        return 0;
-    if (typeEntry->isFlags())
-        return findAbstractMetaEnum(static_cast<const FlagsTypeEntry*>(typeEntry));
-    if (typeEntry->isEnum())
-        return findAbstractMetaEnum(static_cast<const EnumTypeEntry*>(typeEntry));
-    return 0;
-}
-
-const AbstractMetaEnum* ApiExtractor::findAbstractMetaEnum(const FlagsTypeEntry* typeEntry) const
-{
-    if (!typeEntry)
-        return 0;
-    return findAbstractMetaEnum(typeEntry->originator());
-}
-
-const AbstractMetaEnum* ApiExtractor::findAbstractMetaEnum(const AbstractMetaType* metaType) const
-{
-    if (!metaType)
-        return 0;
-    return findAbstractMetaEnum(metaType->typeEntry());
+    return m_builder->findEnum(typeEntry);
 }
 
 int ApiExtractor::classCount() const