From ac9303d7073d558efeaf71369c72a969edd49d45 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 29 Sep 2020 08:36:48 +0200 Subject: 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 --- sources/shiboken2/ApiExtractor/abstractmetalang.h | 5 +---- sources/shiboken2/ApiExtractor/doxygenparser.cpp | 3 +-- sources/shiboken2/ApiExtractor/qtdocparser.cpp | 3 +-- sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp | 3 +-- sources/shiboken2/generator/shiboken2/cppgenerator.cpp | 3 +-- sources/shiboken2/generator/shiboken2/headergenerator.cpp | 6 ++---- sources/shiboken2/generator/shiboken2/shibokengenerator.cpp | 3 +-- 7 files changed, 8 insertions(+), 18 deletions(-) (limited to 'sources') diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h index 466464807..648c792b3 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetalang.h +++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h @@ -1413,10 +1413,7 @@ public: AbstractMetaField *findField(const QString &name) const; - AbstractMetaEnumList enums() const - { - return m_enums; - } + const AbstractMetaEnumList &enums() const { return m_enums; } void setEnums(const AbstractMetaEnumList &enums) { m_enums = enums; diff --git a/sources/shiboken2/ApiExtractor/doxygenparser.cpp b/sources/shiboken2/ApiExtractor/doxygenparser.cpp index da6e32fba..cf152720e 100644 --- a/sources/shiboken2/ApiExtractor/doxygenparser.cpp +++ b/sources/shiboken2/ApiExtractor/doxygenparser.cpp @@ -199,8 +199,7 @@ void DoxygenParser::fillDocumentation(AbstractMetaClass* metaClass) } //Enums - const AbstractMetaEnumList &enums = metaClass->enums(); - for (AbstractMetaEnum *meta_enum : enums) { + for (AbstractMetaEnum *meta_enum : metaClass->enums()) { QString query = QLatin1String("/doxygen/compounddef/sectiondef/memberdef[@kind=\"enum\"]/name[text()=\"") + meta_enum->name() + QLatin1String("\"]/.."); QString doc = getDocumentation(xquery, query, DocModificationList()); diff --git a/sources/shiboken2/ApiExtractor/qtdocparser.cpp b/sources/shiboken2/ApiExtractor/qtdocparser.cpp index 40c04a403..d439b3fd5 100644 --- a/sources/shiboken2/ApiExtractor/qtdocparser.cpp +++ b/sources/shiboken2/ApiExtractor/qtdocparser.cpp @@ -285,8 +285,7 @@ void QtDocParser::fillDocumentation(AbstractMetaClass* metaClass) } #endif // Enums - const AbstractMetaEnumList &enums = metaClass->enums(); - for (AbstractMetaEnum *meta_enum : enums) { + for (AbstractMetaEnum *meta_enum : metaClass->enums()) { query.clear(); QTextStream(&query) << classQuery << "/enum[@name=\"" << meta_enum->name() << "\"]/description"; diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp index 6a01bf7a0..efb34aee7 100644 --- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp +++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp @@ -1762,8 +1762,7 @@ void QtDocGenerator::writeEnums(QTextStream& s, const AbstractMetaClass* cppClas { static const QString section_title = QLatin1String(".. attribute:: "); - const AbstractMetaEnumList &enums = cppClass->enums(); - for (AbstractMetaEnum *en : enums) { + for (AbstractMetaEnum *en : cppClass->enums()) { s << section_title << cppClass->fullName() << '.' << en->name() << Qt::endl << Qt::endl; writeFormattedText(s, en->documentation().value(), cppClass); const auto version = versionOf(en->typeEntry()); 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); -- cgit v1.2.3