Core: 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.

Change-Id: I446f9ddc8f8de4a0b79b09edb44f7c1496fbc33f
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

6 files changed, 13 insertions, 13 deletions

diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp
index a6775ec2b6..1162fb31e4 100644
--- a/tests/auto/corelib/io/qdir/tst_qdir.cpp
+++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp
@@ -1786,9 +1786,9 @@ void tst_QDir::searchPaths()
 {
     QFETCH(QString, filename);
     QFETCH(QString, searchPathPrefixes);
-    QStringList searchPathPrefixList = searchPathPrefixes.split(";", QString::SkipEmptyParts);
+    QStringList searchPathPrefixList = searchPathPrefixes.split(";", Qt::SkipEmptyParts);
     QFETCH(QString, searchPaths);
-    QStringList searchPathsList = searchPaths.split(";", QString::SkipEmptyParts);
+    QStringList searchPathsList = searchPaths.split(";", Qt::SkipEmptyParts);
     QFETCH(QString, expectedAbsolutePath);
     bool exists = !expectedAbsolutePath.isEmpty();
 
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index e799369c8a..3de1bef789 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -2439,7 +2439,7 @@ void tst_QProcess::finishProcessBeforeReadingDone()
     QVERIFY(process.waitForStarted());
     loop.exec();
     QStringList lines = QString::fromLocal8Bit(process.readAllStandardOutput()).split(
-            QRegExp(QStringLiteral("[\r\n]")), QString::SkipEmptyParts);
+            QRegExp(QStringLiteral("[\r\n]")), Qt::SkipEmptyParts);
     QVERIFY(!lines.isEmpty());
     QCOMPARE(lines.last(), QStringLiteral("10239 -this is a number"));
     QCOMPARE(process.exitStatus(), QProcess::NormalExit);
@@ -2671,7 +2671,7 @@ void tst_QProcess::finishProcessBeforeReadingDone_deprecated()
     QVERIFY(process.waitForStarted());
     loop.exec();
     QStringList lines = QString::fromLocal8Bit(process.readAllStandardOutput()).split(
-            QRegExp(QStringLiteral("[\r\n]")), QString::SkipEmptyParts);
+            QRegExp(QStringLiteral("[\r\n]")), Qt::SkipEmptyParts);
     QVERIFY(!lines.isEmpty());
     QCOMPARE(lines.last(), QStringLiteral("10239 -this is a number"));
     QCOMPARE(process.exitStatus(), QProcess::NormalExit);
diff --git a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
index dae4e66106..d0fbdb7a2a 100644
--- a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
+++ b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
@@ -360,7 +360,7 @@ static inline QFileInfo findSh()
     QLatin1String sh("/sh");
     QByteArray pEnv = qgetenv("PATH");
     const QLatin1Char pathSep(':');
-    const QStringList rawPaths = QString::fromLocal8Bit(pEnv.constData()).split(pathSep, QString::SkipEmptyParts);
+    const QStringList rawPaths = QString::fromLocal8Bit(pEnv.constData()).split(pathSep, Qt::SkipEmptyParts);
     foreach (const QString &path, rawPaths) {
         if (QFile::exists(path + sh))
             return path + sh;
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
index fd3cc18af5..4ad09203ac 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
@@ -427,7 +427,7 @@ void tst_QMimeDatabase::listAliases()
     QFETCH(QString, inputMime);
     QFETCH(QString, expectedAliases);
     QMimeDatabase db;
-    QStringList expectedAliasesList = expectedAliases.split(',', QString::SkipEmptyParts);
+    QStringList expectedAliasesList = expectedAliases.split(',', Qt::SkipEmptyParts);
     expectedAliasesList.sort();
     QMimeType mime = db.mimeTypeForName(inputMime);
     QVERIFY(mime.isValid());
@@ -715,7 +715,7 @@ void tst_QMimeDatabase::findByFileName_data()
             continue;
 
         QString string = QString::fromLatin1(line.constData(), len - 1).trimmed();
-        QStringList list = string.split(QLatin1Char(' '), QString::SkipEmptyParts);
+        QStringList list = string.split(QLatin1Char(' '), Qt::SkipEmptyParts);
         QVERIFY(list.size() >= 2);
 
         QString filePath = list.at(0);
diff --git a/tests/auto/corelib/text/qstringref/tst_qstringref.cpp b/tests/auto/corelib/text/qstringref/tst_qstringref.cpp
index 6f01947131..dcc825942d 100644
--- a/tests/auto/corelib/text/qstringref/tst_qstringref.cpp
+++ b/tests/auto/corelib/text/qstringref/tst_qstringref.cpp
@@ -2161,18 +2161,18 @@ void tst_QStringRef::split()
         QVERIFY(list == result);
     }
 
-    list = ref.split(sep, QString::KeepEmptyParts);
+    list = ref.split(sep, Qt::KeepEmptyParts);
     QVERIFY(list == result);
     if (sep.size() == 1) {
-        list = ref.split(sep.at(0), QString::KeepEmptyParts);
+        list = ref.split(sep.at(0), Qt::KeepEmptyParts);
         QVERIFY(list == result);
     }
 
     result.removeAll("");
-    list = ref.split(sep, QString::SkipEmptyParts);
+    list = ref.split(sep, Qt::SkipEmptyParts);
     QVERIFY(list == result);
     if (sep.size() == 1) {
-        list = ref.split(sep.at(0), QString::SkipEmptyParts);
+        list = ref.split(sep.at(0), Qt::SkipEmptyParts);
         QVERIFY(list == result);
     }
 }
diff --git a/tests/auto/corelib/text/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/corelib/text/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
index a46011ff6c..b4c2657c84 100644
--- a/tests/auto/corelib/text/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
+++ b/tests/auto/corelib/text/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
@@ -124,7 +124,7 @@ static void generateDataFromFile(const QString &fname)
 
         QString testString;
         QList<int> expectedBreakPositions;
-        foreach (const QString &part, test.simplified().split(QLatin1Char(' '), QString::SkipEmptyParts)) {
+        foreach (const QString &part, test.simplified().split(QLatin1Char(' '), Qt::SkipEmptyParts)) {
             if (part.size() == 1) {
                 if (part.at(0).unicode() == 0xf7)
                     expectedBreakPositions.append(testString.size());
@@ -146,7 +146,7 @@ static void generateDataFromFile(const QString &fname)
         QVERIFY(!expectedBreakPositions.isEmpty());
 
         if (!comments.isEmpty()) {
-            const QStringList lst = comments.simplified().split(QLatin1Char(' '), QString::SkipEmptyParts);
+            const QStringList lst = comments.simplified().split(QLatin1Char(' '), Qt::SkipEmptyParts);
             comments.clear();
             foreach (const QString &part, lst) {
                 if (part.size() == 1) {