From 70102765aaeaa926bd65f4e2a192268420b85459 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 13 May 2020 14:47:39 +0200 Subject: Revert "Revert "Fix deprecation warnings about Qt::SplitBehavior"" Fix warnings in 5.15. This reverts commit 2ca788f85fbc9d58969533d13046bbe19f53fac8. Change-Id: Iaee39e2035f5e4ebdc9b5360a68a5f024f8bde38 Reviewed-by: Christian Tismer --- sources/shiboken2/generator/main.cpp | 2 +- sources/shiboken2/generator/shiboken2/cppgenerator.cpp | 8 ++++---- sources/shiboken2/generator/shiboken2/shibokengenerator.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sources/shiboken2/generator/main.cpp b/sources/shiboken2/generator/main.cpp index b1ae69720..841691484 100644 --- a/sources/shiboken2/generator/main.cpp +++ b/sources/shiboken2/generator/main.cpp @@ -371,7 +371,7 @@ static void parseIncludePathOption(const QString &option, HeaderType headerType, const CommandArgumentMap::iterator it = args.find(option); if (it != args.end()) { const QStringList includePathListList = - it.value().split(pathSplitter, QString::SkipEmptyParts); + it.value().split(pathSplitter, Qt::SkipEmptyParts); args.erase(it); for (const QString &s : includePathListList) { auto path = QFile::encodeName(QDir::cleanPath(s)); diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp index 73bb70da5..34e9cc5eb 100644 --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -1525,10 +1525,10 @@ void CppGenerator::writeConverterRegister(QTextStream &s, const AbstractMetaClas QStringList cppSignature; if (!classContext.forSmartPointer()) { cppSignature = metaClass->qualifiedCppName().split(QLatin1String("::"), - QString::SkipEmptyParts); + Qt::SkipEmptyParts); } else { cppSignature = classContext.preciseType()->cppSignature().split(QLatin1String("::"), - QString::SkipEmptyParts); + Qt::SkipEmptyParts); } while (!cppSignature.isEmpty()) { QString signature = cppSignature.join(QLatin1String("::")); @@ -1976,7 +1976,7 @@ void CppGenerator::writeArgumentsInitializer(QTextStream &s, OverloadData &overl s << INDENT << "PyObject *"; s << PYTHON_ARGS << "[] = {" - << QString(maxArgs, QLatin1Char('0')).split(QLatin1String(""), QString::SkipEmptyParts).join(QLatin1String(", ")) + << QString(maxArgs, QLatin1Char('0')).split(QLatin1String(""), Qt::SkipEmptyParts).join(QLatin1String(", ")) << "};\n"; s << Qt::endl; @@ -5876,7 +5876,7 @@ bool CppGenerator::finishGeneration() if (!referencedType) continue; QString converter = converterObject(referencedType); - QStringList cppSignature = pte->qualifiedCppName().split(QLatin1String("::"), QString::SkipEmptyParts); + QStringList cppSignature = pte->qualifiedCppName().split(QLatin1String("::"), Qt::SkipEmptyParts); while (!cppSignature.isEmpty()) { QString signature = cppSignature.join(QLatin1String("::")); s << INDENT << "Shiboken::Conversions::registerConverterName(" << converter << ", \"" << signature << "\");\n"; diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp index 766047345..47cca8173 100644 --- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp @@ -97,7 +97,7 @@ static QString resolveScopePrefix(const QStringList &scopeList, const QString &v static inline QStringList splitClassScope(const AbstractMetaClass *scope) { - return scope->qualifiedCppName().split(QLatin1String("::"), QString::SkipEmptyParts); + return scope->qualifiedCppName().split(QLatin1String("::"), Qt::SkipEmptyParts); } static QString resolveScopePrefix(const AbstractMetaClass *scope, const QString &value) -- cgit v1.2.3