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 cloaser to that goal.

Change-Id: I3214ad6ccaca9dfd4a026589cabeb40cbf4a6298
Reviewed-by: Simon Hausmann <[email protected]>

9 files changed, 15 insertions, 15 deletions

diff --git a/src/imports/wavefrontmesh/qwavefrontmesh.cpp b/src/imports/wavefrontmesh/qwavefrontmesh.cpp
index e973ef0103..1772c40c50 100644
--- a/src/imports/wavefrontmesh/qwavefrontmesh.cpp
+++ b/src/imports/wavefrontmesh/qwavefrontmesh.cpp
@@ -257,7 +257,7 @@ void QWavefrontMesh::readData()
 
             while (!stream.atEnd()) {
                 stream.readLineInto(&buffer);
-                QVector<QStringRef> tokens = buffer.splitRef(space, QString::SkipEmptyParts);
+                QVector<QStringRef> tokens = buffer.splitRef(space, Qt::SkipEmptyParts);
                 if (tokens.size() < 2)
                     continue;
 
@@ -316,7 +316,7 @@ void QWavefrontMesh::readData()
                     if (tokens.size() >= 4 && tokens.size() <= 5) {
                         {
                             bool ok;
-                            QVector<QStringRef> faceTokens = tokens.at(1).split(slash, QString::SkipEmptyParts);
+                            QVector<QStringRef> faceTokens = tokens.at(1).split(slash, Qt::SkipEmptyParts);
                             Q_ASSERT(!faceTokens.isEmpty());
 
                             p1 = faceTokens.at(0).toInt(&ok) - 1;
@@ -336,7 +336,7 @@ void QWavefrontMesh::readData()
 
                         {
                             bool ok;
-                            QVector<QStringRef> faceTokens = tokens.at(2).split(slash, QString::SkipEmptyParts);
+                            QVector<QStringRef> faceTokens = tokens.at(2).split(slash, Qt::SkipEmptyParts);
                             Q_ASSERT(!faceTokens.isEmpty());
 
                             p2 = faceTokens.at(0).toInt(&ok) - 1;
@@ -356,7 +356,7 @@ void QWavefrontMesh::readData()
 
                         {
                             bool ok;
-                            QVector<QStringRef> faceTokens = tokens.at(3).split(slash, QString::SkipEmptyParts);
+                            QVector<QStringRef> faceTokens = tokens.at(3).split(slash, Qt::SkipEmptyParts);
                             Q_ASSERT(!faceTokens.isEmpty());
 
                             p3 = faceTokens.at(0).toInt(&ok) - 1;
@@ -394,7 +394,7 @@ void QWavefrontMesh::readData()
 
                     if (tokens.size() == 5) {
                         bool ok;
-                        QVector<QStringRef> faceTokens = tokens.at(4).split(slash, QString::SkipEmptyParts);
+                        QVector<QStringRef> faceTokens = tokens.at(4).split(slash, Qt::SkipEmptyParts);
                         Q_ASSERT(!faceTokens.isEmpty());
 
                         int p4 = faceTokens.at(0).toInt(&ok) - 1;
diff --git a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
index bf73440a39..c504ea605a 100644
--- a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
+++ b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
@@ -183,7 +183,7 @@ QQmlNativeDebugConnector::QQmlNativeDebugConnector()
     : m_blockingMode(false)
 {
     const QString args = commandLineArguments();
-    const auto lstjsDebugArguments = args.splitRef(QLatin1Char(','), QString::SkipEmptyParts);
+    const auto lstjsDebugArguments = args.splitRef(QLatin1Char(','), Qt::SkipEmptyParts);
     QStringList services;
     for (const QStringRef &strArgument : lstjsDebugArguments) {
         if (strArgument == QLatin1String("block")) {
diff --git a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
index 33b6606b44..4d68a4508b 100644
--- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
+++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
@@ -345,7 +345,7 @@ void QQmlDebugServerImpl::parseArguments()
     QString fileName;
     QStringList services;
 
-    const auto lstjsDebugArguments = args.splitRef(QLatin1Char(','), QString::SkipEmptyParts);
+    const auto lstjsDebugArguments = args.splitRef(QLatin1Char(','), Qt::SkipEmptyParts);
     for (auto argsIt = lstjsDebugArguments.begin(), argsItEnd = lstjsDebugArguments.end(); argsIt != argsItEnd; ++argsIt) {
         const QStringRef &strArgument = *argsIt;
         if (strArgument.startsWith(QLatin1String("port:"))) {
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index e442f07527..2a6ede83c7 100644
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -534,7 +534,7 @@ static QString joinStringRefs(const QVector<QStringRef> &refs, const QChar &sep)
 */
 QStringList QQmlImports::completeQmldirPaths(const QString &uri, const QStringList &basePaths, int vmaj, int vmin)
 {
-    const QVector<QStringRef> parts = uri.splitRef(Dot, QString::SkipEmptyParts);
+    const QVector<QStringRef> parts = uri.splitRef(Dot, Qt::SkipEmptyParts);
 
     QStringList qmlDirPathsPaths;
     // fully & partially versioned parts + 1 unversioned for each base path
@@ -1881,7 +1881,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
 #else
         QLatin1Char pathSep(':');
 #endif
-        QStringList paths = envImportPath.split(pathSep, QString::SkipEmptyParts);
+        QStringList paths = envImportPath.split(pathSep, Qt::SkipEmptyParts);
         for (int ii = paths.count() - 1; ii >= 0; --ii)
             addImportPath(paths.at(ii));
     }
@@ -1893,7 +1893,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
     if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QT_BUNDLED_LIBS_PATH"))) {
         const QString envImportPath = qEnvironmentVariable("QT_BUNDLED_LIBS_PATH");
         QLatin1Char pathSep(':');
-        QStringList paths = envImportPath.split(pathSep, QString::SkipEmptyParts);
+        QStringList paths = envImportPath.split(pathSep, Qt::SkipEmptyParts);
         for (int ii = paths.count() - 1; ii >= 0; --ii)
             addPluginPath(paths.at(ii));
     }
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 2a1457d818..4b0cbfa1aa 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -7304,7 +7304,7 @@ void tst_qqmlecmascript::forInLoop()
 
     QMetaObject::invokeMethod(object, "listProperty");
 
-    QStringList r = object->property("listResult").toString().split("|", QString::SkipEmptyParts);
+    QStringList r = object->property("listResult").toString().split("|", Qt::SkipEmptyParts);
     QCOMPARE(r.size(), 3);
     QCOMPARE(r[0],QLatin1String("0=obj1"));
     QCOMPARE(r[1],QLatin1String("1=obj2"));
diff --git a/tools/qmleasing/splineeditor.cpp b/tools/qmleasing/splineeditor.cpp
index 69850dc7a1..3657fe3f27 100644
--- a/tools/qmleasing/splineeditor.cpp
+++ b/tools/qmleasing/splineeditor.cpp
@@ -674,7 +674,7 @@ void SplineEditor::setEasingCurve(const QString &code)
         return;
     if (code.startsWith(QLatin1Char('[')) && code.endsWith(QLatin1Char(']'))) {
         const QStringRef cleanCode(&code, 1, code.size() - 2);
-        const auto stringList = cleanCode.split(QLatin1Char(','), QString::SkipEmptyParts);
+        const auto stringList = cleanCode.split(QLatin1Char(','), Qt::SkipEmptyParts);
         if (stringList.count() >= 6 && (stringList.count() % 6 == 0)) {
             QVector<qreal> realList;
             realList.reserve(stringList.count());
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index e5d43a8e89..aca11e2ca4 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -179,7 +179,7 @@ QPair<QString, QString> resolveImportPath(const QString &uri, const QString &ver
 {
     const QLatin1Char dot('.');
     const QLatin1Char slash('/');
-    const QStringList parts = uri.split(dot, QString::SkipEmptyParts);
+    const QStringList parts = uri.split(dot, Qt::SkipEmptyParts);
 
     QString ver = version;
     while (true) {
diff --git a/tools/qmllint/findunqualified.cpp b/tools/qmllint/findunqualified.cpp
index 88466cfae9..ae23d6d5f8 100644
--- a/tools/qmllint/findunqualified.cpp
+++ b/tools/qmllint/findunqualified.cpp
@@ -124,7 +124,7 @@ QStringList completeImportPaths(const QString &uri, const QString &basePath, int
     static const QLatin1Char Slash('/');
     static const QLatin1Char Backslash('\\');
 
-    const QVector<QStringRef> parts = uri.splitRef(QLatin1Char('.'), QString::SkipEmptyParts);
+    const QVector<QStringRef> parts = uri.splitRef(QLatin1Char('.'), Qt::SkipEmptyParts);
 
     QStringList qmlDirPathsPaths;
     // fully & partially versioned parts + 1 unversioned for each base path
diff --git a/tools/qmlprofiler/qmlprofilerapplication.cpp b/tools/qmlprofiler/qmlprofilerapplication.cpp
index 7b010546c3..7c92f428ae 100644
--- a/tools/qmlprofiler/qmlprofilerapplication.cpp
+++ b/tools/qmlprofiler/qmlprofilerapplication.cpp
@@ -354,7 +354,7 @@ bool QmlProfilerApplication::checkOutputFile(PendingRequest pending)
 
 void QmlProfilerApplication::userCommand(const QString &command)
 {
-    auto args = command.splitRef(QChar::Space, QString::SkipEmptyParts);
+    auto args = command.splitRef(QChar::Space, Qt::SkipEmptyParts);
     if (args.isEmpty()) {
         prompt();
         return;