Use Qt::SplitBehavior in preference to QString::SplitBehavior

The Qt version was added in 5.14 "for use as eventual replacement for
QString::SplitBehavior." Move another step closer to that goal.
De-UKified spelling of "behavior" in the process.

Change-Id: I13b4fdc82fdee779b2e4d03ce287b749dadd1b71
Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net>
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>

4 files changed, 13 insertions, 13 deletions

diff --git a/src/contacts/qcontactmanager_p.cpp b/src/contacts/qcontactmanager_p.cpp
index 522668881..241a9e533 100644
--- a/src/contacts/qcontactmanager_p.cpp
+++ b/src/contacts/qcontactmanager_p.cpp
@@ -418,7 +418,7 @@ bool QContactManagerData::parseUri(const QString &uriString, QString *managerNam
     // we assume that the prefix, managerid, and params cannot contain `:', `=', or `&'
     // similarly, that neither param keys nor param values can contain these characters.
 
-    const QStringList colonSplit = uriString.split(QLatin1Char(':'), QString::KeepEmptyParts);
+    const QStringList colonSplit = uriString.split(QLatin1Char(':'), Qt::KeepEmptyParts);
     if ((colonSplit.size() != 3) && (strict || colonSplit.size() != 2))
         return false;
 
@@ -432,10 +432,10 @@ bool QContactManagerData::parseUri(const QString &uriString, QString *managerNam
     if (!paramString.isEmpty()) {
         // Now we have to decode each parameter
         QMap<QString, QString> outParams;
-        const QStringList pairs = paramString.split(QRegularExpression(QStringLiteral("&(?!(amp;|equ;|#))")), QString::KeepEmptyParts);
+        const QStringList pairs = paramString.split(QRegularExpression(QStringLiteral("&(?!(amp;|equ;|#))")), Qt::KeepEmptyParts);
         for (int i = 0; i < pairs.size(); ++i) {
             // This should be something like "foo&amp;bar&equ;=grob&amp;"
-            const QStringList pair = pairs.at(i).split(QLatin1Char('='), QString::KeepEmptyParts);
+            const QStringList pair = pairs.at(i).split(QLatin1Char('='), Qt::KeepEmptyParts);
             if (pair.size() != 2)
                 return false;
 
diff --git a/src/organizer/qorganizermanager_p.cpp b/src/organizer/qorganizermanager_p.cpp
index 82c2db1ba..d3e6f72d7 100644
--- a/src/organizer/qorganizermanager_p.cpp
+++ b/src/organizer/qorganizermanager_p.cpp
@@ -319,7 +319,7 @@ bool QOrganizerManagerData::parseUri(const QString &uriString, QString *managerN
     // we assume that the prefix, managerid, and params cannot contain `:', `=', or `&'
     // similarly, that neither param keys nor param values can contain these characters.
 
-    const QStringList colonSplit = uriString.split(QLatin1Char(':'), QString::KeepEmptyParts);
+    const QStringList colonSplit = uriString.split(QLatin1Char(':'), Qt::KeepEmptyParts);
     if ((colonSplit.size() != 3) && (strict || colonSplit.size() != 2))
         return false;
 
@@ -333,10 +333,10 @@ bool QOrganizerManagerData::parseUri(const QString &uriString, QString *managerN
     if (!paramString.isEmpty()) {
         // Now we have to decode each parameter
         QMap<QString, QString> outParams;
-        const QStringList pairs = paramString.split(QRegularExpression(QStringLiteral("&(?!(amp;|equ;|#))")), QString::KeepEmptyParts);
+        const QStringList pairs = paramString.split(QRegularExpression(QStringLiteral("&(?!(amp;|equ;|#))")), Qt::KeepEmptyParts);
         for (int i = 0; i < pairs.size(); ++i) {
             // This should be something like "foo&amp;bar&equ;=grob&amp;"
-            const QStringList pair = pairs.at(i).split(QLatin1Char('='), QString::KeepEmptyParts);
+            const QStringList pair = pairs.at(i).split(QLatin1Char('='), Qt::KeepEmptyParts);
             if (pair.size() != 2)
                 return false;
 
diff --git a/src/versit/qversitreader_p.cpp b/src/versit/qversitreader_p.cpp
index 5793cb37a..66203f906 100644
--- a/src/versit/qversitreader_p.cpp
+++ b/src/versit/qversitreader_p.cpp
@@ -1042,7 +1042,7 @@ QMultiHash<QString,QString> QVersitReaderPrivate::extractVCard30PropertyParams(
         QString name(paramName(param, codec));
         removeBackSlashEscaping(&name);
         QString values = paramValue(param, codec);
-        QStringList valueList = splitValue(values, QLatin1Char(','), QString::SkipEmptyParts, true);
+        QStringList valueList = splitValue(values, QLatin1Char(','), Qt::SkipEmptyParts, true);
         foreach (QString value, valueList) {
             removeBackSlashEscaping(&value);
             result.insert(name, value);
@@ -1189,12 +1189,12 @@ bool QVersitReaderPrivate::splitStructuredValue(
     QVariant variant = property->variantValue();
     if (property->valueType() == QVersitProperty::CompoundType) {
         variant.setValue(splitValue(variant.toString(), QLatin1Char(';'),
-                                    QString::KeepEmptyParts, hasEscapedBackslashes));
+                                    Qt::KeepEmptyParts, hasEscapedBackslashes));
         property->setValue(variant);
         return true;
     } else if (property->valueType() == QVersitProperty::ListType) {
         variant.setValue(splitValue(variant.toString(), QLatin1Char(','),
-                                    QString::SkipEmptyParts, hasEscapedBackslashes));
+                                    Qt::SkipEmptyParts, hasEscapedBackslashes));
         property->setValue(variant);
         return true;
     }
@@ -1210,7 +1210,7 @@ bool QVersitReaderPrivate::splitStructuredValue(
  */
 QStringList QVersitReaderPrivate::splitValue(const QString& string,
                                              const QChar& sep,
-                                             QString::SplitBehavior behaviour,
+                                             Qt::SplitBehavior behavior,
                                              bool hasEscapedBackslashes)
 {
     QStringList list;
@@ -1231,7 +1231,7 @@ QStringList QVersitReaderPrivate::splitValue(const QString& string,
             } else {
                 // we see a separator
                 segment += string.midRef(segmentStartIndex, i - segmentStartIndex);
-                if (behaviour == QString::KeepEmptyParts || !segment.isEmpty())
+                if (behavior == Qt::KeepEmptyParts || !segment.isEmpty())
                     list.append(segment);
                 segment.clear();
             }
@@ -1243,7 +1243,7 @@ QStringList QVersitReaderPrivate::splitValue(const QString& string,
     }
     // The rest of the string after the last sep.
     segment += string.midRef(segmentStartIndex);
-    if (behaviour == QString::KeepEmptyParts || !segment.isEmpty())
+    if (behavior == Qt::KeepEmptyParts || !segment.isEmpty())
         list.append(segment);
     return list;
 }
diff --git a/src/versit/qversitreader_p.h b/src/versit/qversitreader_p.h
index 1716295b4..d8ed7eca9 100644
--- a/src/versit/qversitreader_p.h
+++ b/src/versit/qversitreader_p.h
@@ -276,7 +276,7 @@ public: // New functions
                               bool hasEscapedBackslashes) const;
     static QStringList splitValue(const QString& string,
                                   const QChar& sep,
-                                  QString::SplitBehavior behaviour,
+                                  Qt::SplitBehavior behavior,
                                   bool hasEscapedBackslashes);
     static void removeBackSlashEscaping(QString* text);