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/generator/shiboken/overloaddata.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/generator/shiboken/overloaddata.cpp')
| -rw-r--r-- | sources/shiboken6/generator/shiboken/overloaddata.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sources/shiboken6/generator/shiboken/overloaddata.cpp b/sources/shiboken6/generator/shiboken/overloaddata.cpp index 358507f76..6113cdda1 100644 --- a/sources/shiboken6/generator/shiboken/overloaddata.cpp +++ b/sources/shiboken6/generator/shiboken/overloaddata.cpp @@ -157,7 +157,7 @@ static QString getImplicitConversionTypeName(const AbstractMetaType &containerTy // overloaddata.cpp static QString msgCyclicDependency(const QString &funcName, const QString &graphName, const AbstractMetaFunctionCList &cyclic, - const OverloadData::MetaFunctionList &involvedConversions) + const AbstractMetaFunctionCList &involvedConversions) { QString result; QTextStream str(&result); @@ -301,7 +301,7 @@ void OverloadData::sortNextOverloads() QStringList classesWithIntegerImplicitConversion; - MetaFunctionList involvedConversions; + AbstractMetaFunctionCList involvedConversions; for (OverloadData *ov : qAsConst(m_nextOverloadData)) { const AbstractMetaType &targetType = ov->argType(); @@ -739,9 +739,9 @@ bool OverloadData::isFinalOccurrence(const AbstractMetaFunction *func) const return true; } -OverloadData::MetaFunctionList OverloadData::overloadsWithoutRepetition() const +AbstractMetaFunctionCList OverloadData::overloadsWithoutRepetition() const { - MetaFunctionList overloads = m_overloads; + AbstractMetaFunctionCList overloads = m_overloads; for (const AbstractMetaFunction *func : m_overloads) { if (func->minimalSignature().endsWith(QLatin1String("const"))) continue; @@ -769,7 +769,7 @@ const AbstractMetaFunction *OverloadData::getFunctionWithDefaultValue() const return nullptr; } -QVector<int> OverloadData::invalidArgumentLengths() const +QList<int> OverloadData::invalidArgumentLengths() const { QSet<int> validArgLengths; @@ -787,7 +787,7 @@ QVector<int> OverloadData::invalidArgumentLengths() const validArgLengths << args.size() - offset; } - QVector<int> invalidArgLengths; + QList<int> invalidArgLengths; for (int i = minArgs() + 1; i < maxArgs(); i++) { if (!validArgLengths.contains(i)) invalidArgLengths.append(i); |