diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-22 13:56:55 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-22 13:58:54 +0200 |
| commit | 6ba23a245449aaa9c1a7ab8e954d93f5f4366530 (patch) | |
| tree | 55c5aa5610861743aceceafb86802f4c0251369d /sources/shiboken2 | |
| parent | d64ff5aff4af37f3a6e0098e499116baa22950ed (diff) | |
Fix deprecation warnings about deprecated container conversions
Fix warnings introduced by
qtbase/92f984273262531f909ede17a324f546fe502b5c.
Change-Id: Ic46e5c93f8dd1910742fbd0578602cca4461643b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'sources/shiboken2')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | 3 | ||||
| -rw-r--r-- | sources/shiboken2/generator/shiboken2/cppgenerator.cpp | 2 | ||||
| -rw-r--r-- | sources/shiboken2/generator/shiboken2/overloaddata.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp index 7e998d315..cfe9d7d89 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp @@ -1582,8 +1582,9 @@ void AbstractMetaBuilderPrivate::traverseEnums(const ScopeModelItem &scopeItem, const QStringList &enumsDeclarations) { const EnumList &enums = scopeItem->enums(); + const QSet<QString> enumsDeclarationSet(enumsDeclarations.cbegin(), enumsDeclarations.cend()); for (const EnumModelItem &enumItem : enums) { - AbstractMetaEnum* metaEnum = traverseEnum(enumItem, metaClass, QSet<QString>::fromList(enumsDeclarations)); + AbstractMetaEnum* metaEnum = traverseEnum(enumItem, metaClass, enumsDeclarationSet); if (metaEnum) { metaClass->addEnum(metaEnum); metaEnum->setEnclosingClass(metaClass); diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp index 58788d5ef..32b219fa2 100644 --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -1687,7 +1687,7 @@ void CppGenerator::writeConstructorWrapper(QTextStream &s, const AbstractMetaFun argNamesSet << arg->name(); } } - QStringList argNamesList = argNamesSet.toList(); + QStringList argNamesList = argNamesSet.values(); std::sort(argNamesList.begin(), argNamesList.end()); if (argNamesList.isEmpty()) { s << INDENT << "const char** argNames{};" << endl; diff --git a/sources/shiboken2/generator/shiboken2/overloaddata.cpp b/sources/shiboken2/generator/shiboken2/overloaddata.cpp index becd66879..bbcdd6d5f 100644 --- a/sources/shiboken2/generator/shiboken2/overloaddata.cpp +++ b/sources/shiboken2/generator/shiboken2/overloaddata.cpp @@ -576,7 +576,7 @@ QStringList OverloadData::returnTypes() const else retTypes << QLatin1String("void"); } - return QStringList(retTypes.toList()); + return retTypes.values(); } bool OverloadData::hasNonVoidReturnType() const |