shiboken2: Change AbstractMetaClass::enums() to return const ref

This allows for removing a few temporary variables and/or qAsConst().

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

3 files changed, 4 insertions, 8 deletions

diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index af7c9777a..ec63b3931 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -5462,8 +5462,7 @@ void CppGenerator::writeInitQtMetaTypeFunctionBody(QTextStream &s, const Generat
         }
     }
 
-    const AbstractMetaEnumList &enums = metaClass->enums();
-    for (AbstractMetaEnum *metaEnum : enums) {
+    for (AbstractMetaEnum *metaEnum : metaClass->enums()) {
         if (!metaEnum->isPrivate() && !metaEnum->isAnonymous()) {
             for (const QString &name : qAsConst(nameVariants))
                 s << INDENT << "qRegisterMetaType< ::" << metaEnum->typeEntry()->qualifiedCppName() << " >(\"" << name << "::" << metaEnum->name() << "\");\n";
diff --git a/sources/shiboken2/generator/shiboken2/headergenerator.cpp b/sources/shiboken2/generator/shiboken2/headergenerator.cpp
index cd99d76be..e46f484fc 100644
--- a/sources/shiboken2/generator/shiboken2/headergenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/headergenerator.cpp
@@ -343,8 +343,7 @@ void HeaderGenerator::writeTypeIndexValueLines(QTextStream &s, const AbstractMet
     if (!typeEntry->generateCode() || !NamespaceTypeEntry::isVisibleScope(typeEntry))
         return;
     writeTypeIndexValueLine(s, metaClass->typeEntry());
-    const AbstractMetaEnumList &enums = metaClass->enums();
-    for (const AbstractMetaEnum *metaEnum : enums) {
+    for (const AbstractMetaEnum *metaEnum : metaClass->enums()) {
         if (metaEnum->isPrivate())
             continue;
         writeTypeIndexValueLine(s, metaEnum->typeEntry());
@@ -503,8 +502,7 @@ bool HeaderGenerator::finishGeneration()
         const TypeEntry *classType = metaClass->typeEntry();
         includes << classType->include();
 
-        const AbstractMetaEnumList &enums = metaClass->enums();
-        for (const AbstractMetaEnum *cppEnum : enums) {
+        for (const AbstractMetaEnum *cppEnum : metaClass->enums()) {
             if (cppEnum->isAnonymous() || cppEnum->isPrivate())
                 continue;
             EnumTypeEntry *enumType = cppEnum->typeEntry();
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
index 97cbd26e9..b2c762115 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
@@ -339,8 +339,7 @@ void ShibokenGenerator::lookForEnumsInClassesNotToBeGenerated(AbstractMetaEnumLi
     Q_ASSERT(metaClass);
     // if a scope is not to be generated, collect its enums into the parent scope
     if (!NamespaceTypeEntry::isVisibleScope(metaClass->typeEntry())) {
-        const AbstractMetaEnumList &enums = metaClass->enums();
-        for (AbstractMetaEnum *metaEnum : enums) {
+        for (AbstractMetaEnum *metaEnum : metaClass->enums()) {
             if (!metaEnum->isPrivate() && metaEnum->typeEntry()->generateCode()
                 && !enumList.contains(metaEnum)) {
                 enumList.append(metaEnum);