diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-25 08:03:23 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-25 11:43:14 +0000 |
| commit | fcc2431ab132519a0038b6702372d8460d7cd635 (patch) | |
| tree | 25933ed2fd3a8e5a850e2877b26755d613eaf4c7 /sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp | |
| parent | 30620db0941a36298b194d7bfbf5213ba4eb8bba (diff) | |
Replace QVector by QList
Change AbstractMetaClass::templateArguments()
to return TypeEntries (const TypeEntry *) instead
non-const.
Remove redundant typedef OverloadData::MetaFunctionList.
Use existing typedefs in some places.
Add new typedefs for MetaObjectBuilder::EnumValues and
AbstractMetaFunctionCList.
Change-Id: Ia241b5fbe54d60ea57175fb1f6c844604e066a3d
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp')
| -rw-r--r-- | sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp index a583b6ec2..33eb85ace 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp @@ -1009,7 +1009,7 @@ AbstractMetaClass *AbstractMetaBuilderPrivate::traverseClass(const FileModelItem *metaClass += AbstractMetaAttributes::FinalCppClass; QStringList baseClassNames; - const QVector<_ClassModelItem::BaseClass> &baseClasses = classItem->baseClasses(); + const QList<_ClassModelItem::BaseClass> &baseClasses = classItem->baseClasses(); for (const _ClassModelItem::BaseClass &baseClass : baseClasses) { if (baseClass.accessPolicy == CodeModel::Public) baseClassNames.append(baseClass.name); @@ -1028,7 +1028,7 @@ AbstractMetaClass *AbstractMetaBuilderPrivate::traverseClass(const FileModelItem } TemplateParameterList template_parameters = classItem->templateParameters(); - QVector<TypeEntry *> template_args; + TypeEntries template_args; template_args.clear(); auto argumentParent = metaClass->typeEntry()->typeSystemTypeEntry(); for (int i = 0; i < template_parameters.size(); ++i) { @@ -2005,8 +2005,8 @@ TypeEntries AbstractMetaBuilderPrivate::findTypeEntriesHelper(const QString &qua // 8. No? Check if the current class is a template and this type is one // of the parameters. if (currentClass) { - const QVector<TypeEntry *> &template_args = currentClass->templateArguments(); - for (TypeEntry *te : template_args) { + const auto &template_args = currentClass->templateArguments(); + for (const TypeEntry *te : template_args) { if (te->name() == qualifiedName) return {te}; } @@ -3033,7 +3033,7 @@ void AbstractMetaBuilderPrivate::pushScope(const NamespaceModelItem &item) { // For purposes of type lookup, join all namespaces of the same name // within the parent item. - QVector<NamespaceModelItem> candidates; + QList<NamespaceModelItem> candidates; const QString name = item->name(); if (!m_scopes.isEmpty()) { for (const auto &n : m_scopes.constLast()->namespaces()) { |