Use Qt::SplitBehavior in preference to QString::SplitBehaviorv5.15.0-beta2

The Qt version was added in 5.14 "for use as eventual replacement for
QString::SplitBehavior." Move another step closer to that goal.

Change-Id: Id6bf95a2717b521a8100c57be34b9e85d20177f7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

4 files changed, 20 insertions, 20 deletions

diff --git a/src/xmlpatterns/functions/qpatternmatchingfns.cpp b/src/xmlpatterns/functions/qpatternmatchingfns.cpp
index 4ab4051..72b2b1e 100644
--- a/src/xmlpatterns/functions/qpatternmatchingfns.cpp
+++ b/src/xmlpatterns/functions/qpatternmatchingfns.cpp
@@ -218,7 +218,7 @@ Item::Iterator::Ptr TokenizeFN::evaluateSequence(const DynamicContext::Ptr &cont
         return CommonValues::emptyIterator;
 
     QRegExp regExp(pattern(context));
-    const QStringList result(input.split(regExp, QString::KeepEmptyParts));
+    const QStringList result(input.split(regExp, Qt::KeepEmptyParts));
 
     return makeItemMappingIterator<Item>(ConstPtr(this),
                                          makeListIterator(result),
diff --git a/src/xmlpatterns/schema/qxsdschemaparser.cpp b/src/xmlpatterns/schema/qxsdschemaparser.cpp
index 9f11d69..33b9f94 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaparser.cpp
@@ -450,7 +450,7 @@ void XsdSchemaParser::parseSchema(ParserType parserType)
 
     if (hasAttribute(QString::fromLatin1("blockDefault"))) {
         const QString blockDefault = readAttribute(QString::fromLatin1("blockDefault"));
-        const QStringList blockDefaultList = blockDefault.split(QLatin1Char(' '), QString::SkipEmptyParts);
+        const QStringList blockDefaultList = blockDefault.split(QLatin1Char(' '), Qt::SkipEmptyParts);
         for (int i = 0; i < blockDefaultList.count(); ++i) {
             const QString value = blockDefaultList.at(i);
             if (value != QString::fromLatin1("#all") &&
@@ -467,7 +467,7 @@ void XsdSchemaParser::parseSchema(ParserType parserType)
 
     if (hasAttribute(QString::fromLatin1("finalDefault"))) {
         const QString finalDefault = readAttribute(QString::fromLatin1("finalDefault"));
-        const QStringList finalDefaultList = finalDefault.split(QLatin1Char(' '), QString::SkipEmptyParts);
+        const QStringList finalDefaultList = finalDefault.split(QLatin1Char(' '), Qt::SkipEmptyParts);
         for (int i = 0; i < finalDefaultList.count(); ++i) {
             const QString value = finalDefaultList.at(i);
             if (value != QString::fromLatin1("#all") &&
@@ -1733,7 +1733,7 @@ void XsdSchemaParser::parseUnion(const XsdSimpleType::Ptr &ptr)
     bool hasMemberTypesSpecified = false;
 
     if (hasAttribute(QString::fromLatin1("memberTypes"))) {
-        const QStringList memberTypes = readAttribute(QString::fromLatin1("memberTypes")).split(QLatin1Char(' '), QString::SkipEmptyParts);
+        const QStringList memberTypes = readAttribute(QString::fromLatin1("memberTypes")).split(QLatin1Char(' '), Qt::SkipEmptyParts);
         QList<QXmlName> typeNames;
 
         for (int i = 0; i < memberTypes.count(); ++i) {
@@ -4550,7 +4550,7 @@ XsdElement::Ptr XsdSchemaParser::parseGlobalElement()
         QList<QXmlName> elementNames;
 
         const QString value = readAttribute(QString::fromLatin1("substitutionGroup"));
-        const QStringList substitutionGroups = value.split(QLatin1Char(' '), QString::SkipEmptyParts);
+        const QStringList substitutionGroups = value.split(QLatin1Char(' '), Qt::SkipEmptyParts);
         if (substitutionGroups.isEmpty()) {
             attributeContentError("substitutionGroup", "element", value, BuiltinTypes::xsQName);
             return element;
@@ -5420,7 +5420,7 @@ XsdWildcard::Ptr XsdSchemaParser::parseAny(const XsdParticle::Ptr &particle)
     }
 
     if (hasAttribute(QString::fromLatin1("namespace"))) {
-        const auto valueList = readAttribute(QString::fromLatin1("namespace")).split(QLatin1Char(' '), QString::SkipEmptyParts);
+        const auto valueList = readAttribute(QString::fromLatin1("namespace")).split(QLatin1Char(' '), Qt::SkipEmptyParts);
         const QSet<QString> values(valueList.cbegin(), valueList.cend());
         if ((values.contains(QString::fromLatin1("##any")) || values.contains(QString::fromLatin1("##other"))) && values.count() != 1) {
             error(QtXmlPatterns::tr("%1 attribute of %2 element must contain %3, %4 or a list of URIs.")
@@ -5533,7 +5533,7 @@ XsdWildcard::Ptr XsdSchemaParser::parseAnyAttribute()
 
     // parse attributes
     if (hasAttribute(QString::fromLatin1("namespace"))) {
-        const auto valueList = readAttribute(QString::fromLatin1("namespace")).split(QLatin1Char(' '), QString::SkipEmptyParts);
+        const auto valueList = readAttribute(QString::fromLatin1("namespace")).split(QLatin1Char(' '), Qt::SkipEmptyParts);
         const QSet<QString> values(valueList.cbegin(), valueList.cend());
         if ((values.contains(QString::fromLatin1("##any")) || values.contains(QString::fromLatin1("##other"))) && values.count() != 1) {
             error(QtXmlPatterns::tr("%1 attribute of %2 element must contain %3, %4 or a list of URIs.")
@@ -5796,7 +5796,7 @@ SchemaType::DerivationConstraints XsdSchemaParser::readDerivationConstraintAttri
         content = readAttribute(QString::fromLatin1("final"));
 
         // split string into list to validate the content of the attribute
-        const QStringList values = content.split(QLatin1Char(' '), QString::SkipEmptyParts);
+        const QStringList values = content.split(QLatin1Char(' '), Qt::SkipEmptyParts);
         for (int i = 0; i < values.count(); i++) {
             const QString value = values.at(i);
             if (!allowedContent.contains(value) && (value != QString::fromLatin1("#all"))) {
@@ -5817,7 +5817,7 @@ SchemaType::DerivationConstraints XsdSchemaParser::readDerivationConstraintAttri
         content = m_finalDefault;
     }
 
-    const auto &contentList = content.split(QLatin1Char(' '), QString::SkipEmptyParts);
+    const auto &contentList = content.split(QLatin1Char(' '), Qt::SkipEmptyParts);
     QSet<QString> contentSet(contentList.cbegin(), contentList.cend());
 
     // if the '#all' tag is defined, we return all allowed values
@@ -5858,7 +5858,7 @@ NamedSchemaComponent::BlockingConstraints XsdSchemaParser::readBlockingConstrain
         content = readAttribute(QString::fromLatin1("block"));
 
         // split string into list to validate the content of the attribute
-        const QStringList values = content.split(QLatin1Char(' '), QString::SkipEmptyParts);
+        const QStringList values = content.split(QLatin1Char(' '), Qt::SkipEmptyParts);
         for (int i = 0; i < values.count(); i++) {
             const QString value = values.at(i);
             if (!allowedContent.contains(value) && (value != QString::fromLatin1("#all"))) {
@@ -5879,7 +5879,7 @@ NamedSchemaComponent::BlockingConstraints XsdSchemaParser::readBlockingConstrain
         content = m_blockDefault;
     }
 
-    const auto &contentList = content.split(QLatin1Char(' '), QString::SkipEmptyParts);
+    const auto &contentList = content.split(QLatin1Char(' '), Qt::SkipEmptyParts);
     QSet<QString> contentSet(contentList.cbegin(), contentList.cend());
 
     // if the '#all' tag is defined, we return all allowed values
diff --git a/src/xmlpatterns/schema/qxsdtypechecker.cpp b/src/xmlpatterns/schema/qxsdtypechecker.cpp
index d165a1f..669f42c 100644
--- a/src/xmlpatterns/schema/qxsdtypechecker.cpp
+++ b/src/xmlpatterns/schema/qxsdtypechecker.cpp
@@ -266,7 +266,7 @@ bool XsdTypeChecker::isValidString(const QString &normalizedString, const AnySim
                 *boundType = type;
 
         } else if (simpleType->category() == XsdSimpleType::SimpleTypeList) {
-            QStringList entries = normalizedString.split(QLatin1Char(' '), QString::SkipEmptyParts);
+            QStringList entries = normalizedString.split(QLatin1Char(' '), Qt::SkipEmptyParts);
             for (int i = 0; i < entries.count(); ++i) {
                 entries[i] = normalizedValue(entries.at(i), mergedFacetsForType(simpleType->itemType(), m_context));
             }
@@ -336,8 +336,8 @@ bool XsdTypeChecker::valuesAreEqual(const QString &value, const QString &otherVa
 
         return XsdSchemaHelper::constructAndCompare(valueStr, AtomicComparator::OperatorEqual, otherValueStr, targetType, m_context, m_reflection);
     } else if (type->category() == SchemaType::SimpleTypeList) {
-        const QStringList values = value.split(QLatin1Char(' '), QString::SkipEmptyParts);
-        const QStringList otherValues = otherValue.split(QLatin1Char(' '), QString::SkipEmptyParts);
+        const QStringList values = value.split(QLatin1Char(' '), Qt::SkipEmptyParts);
+        const QStringList otherValues = otherValue.split(QLatin1Char(' '), Qt::SkipEmptyParts);
         if (values.count() != otherValues.count())
             return false;
 
@@ -1131,7 +1131,7 @@ bool XsdTypeChecker::checkConstrainingFacetsList(const QStringList &values, cons
 
             const AtomicValue::List multiValue = facet->multiValue();
             for (int i = 0; i < multiValue.count(); ++i) {
-                const QStringList facetValueList = multiValue.at(i)->as<DerivedString<TypeString> >()->stringValue().split(QLatin1Char(' '), QString::SkipEmptyParts);
+                const QStringList facetValueList = multiValue.at(i)->as<DerivedString<TypeString> >()->stringValue().split(QLatin1Char(' '), Qt::SkipEmptyParts);
 
                 // create the list of atomic string values
                 QList<QXmlName> facetValues;
@@ -1171,7 +1171,7 @@ bool XsdTypeChecker::checkConstrainingFacetsList(const QStringList &values, cons
 
             const AtomicValue::List multiValue = facet->multiValue();
             for (int i = 0; i < multiValue.count(); ++i) {
-                const QStringList facetValueList = multiValue.at(i)->as<DerivedString<TypeString> >()->stringValue().split(QLatin1Char(' '), QString::SkipEmptyParts);
+                const QStringList facetValueList = multiValue.at(i)->as<DerivedString<TypeString> >()->stringValue().split(QLatin1Char(' '), Qt::SkipEmptyParts);
 
                 // create the list of atomic string values
                 AtomicValue::List facetValues;
diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
index f1b4014..50d5a16 100644
--- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
+++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
@@ -210,7 +210,7 @@ bool XsdValidatingInstanceReader::validate(bool &hasStateMachine, XsdElement::Pt
     // first check if a custom schema is defined
     if (hasAttribute(m_xsiSchemaLocationName)) {
         const QString schemaLocation = attribute(m_xsiSchemaLocationName);
-        const QStringList parts = schemaLocation.split(QLatin1Char(' '), QString::SkipEmptyParts);
+        const QStringList parts = schemaLocation.split(QLatin1Char(' '), Qt::SkipEmptyParts);
         if ((parts.count()%2) == 1) {
             error(QtXmlPatterns::tr("%1 contains invalid data.").arg(formatKeyword(m_namePool, m_xsiSchemaLocationName)));
             return false;
@@ -595,7 +595,7 @@ bool XsdValidatingInstanceReader::validateElementSimpleType(const XsdElement::Pt
     }
 
     if (m_idRefsType->wxsTypeMatches(type)) {
-        const QStringList idRefs = actualValue.split(QLatin1Char(' '), QString::SkipEmptyParts);
+        const QStringList idRefs = actualValue.split(QLatin1Char(' '), Qt::SkipEmptyParts);
         for (int i = 0; i < idRefs.count(); ++i) {
             m_idRefs.insert(idRefs.at(i));
         }
@@ -853,7 +853,7 @@ bool XsdValidatingInstanceReader::validateAttribute(const XsdAttributeUse::Ptr &
     }
 
     if (m_idRefsType->wxsTypeMatches(declaration->attribute()->type())) {
-        const QStringList idRefs = actualValue.split(QLatin1Char(' '), QString::SkipEmptyParts);
+        const QStringList idRefs = actualValue.split(QLatin1Char(' '), Qt::SkipEmptyParts);
         for (int i = 0; i < idRefs.count(); ++i)
             m_idRefs.insert(idRefs.at(i));
     } else if (BuiltinTypes::xsIDREF->wxsTypeMatches(declaration->attribute()->type())) {
@@ -899,7 +899,7 @@ bool XsdValidatingInstanceReader::validateAttribute(const XsdAttribute::Ptr &dec
     }
 
     if (m_idRefsType->wxsTypeMatches(declaration->type())) {
-        const QStringList idRefs = actualValue.split(QLatin1Char(' '), QString::SkipEmptyParts);
+        const QStringList idRefs = actualValue.split(QLatin1Char(' '), Qt::SkipEmptyParts);
         for (int i = 0; i < idRefs.count(); ++i)
             m_idRefs.insert(idRefs.at(i));
     } else if (BuiltinTypes::xsIDREF->wxsTypeMatches(declaration->type())) {