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: I7137cf8339bfe9fdcf4cb7cc695cb146aef410fb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

6 files changed, 11 insertions, 11 deletions

diff --git a/src/linguist/linguist/messageeditorwidgets.cpp b/src/linguist/linguist/messageeditorwidgets.cpp
index 6c16b36fd..bb0eb5baf 100644
--- a/src/linguist/linguist/messageeditorwidgets.cpp
+++ b/src/linguist/linguist/messageeditorwidgets.cpp
@@ -372,7 +372,7 @@ void FormMultiWidget::slotSelectionChanged()
 
 void FormMultiWidget::setTranslation(const QString &text, bool userAction)
 {
-    QStringList texts = text.split(QChar(Translator::BinaryVariantSeparator), QString::KeepEmptyParts);
+    QStringList texts = text.split(QChar(Translator::BinaryVariantSeparator), Qt::KeepEmptyParts);
 
     while (m_editors.count() > texts.count()) {
         delete m_minusButtons.takeLast();
diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
index 712b95550..104971e08 100644
--- a/src/linguist/lupdate/main.cpp
+++ b/src/linguist/lupdate/main.cpp
@@ -285,7 +285,7 @@ static void printUsage()
 
 static bool handleTrFunctionAliases(const QString &arg)
 {
-    foreach (const QString &pair, arg.split(QLatin1Char(','), QString::SkipEmptyParts)) {
+    foreach (const QString &pair, arg.split(QLatin1Char(','), Qt::SkipEmptyParts)) {
         const int equalSign = pair.indexOf(QLatin1Char('='));
         if (equalSign < 0) {
             printErr(LU::tr("tr-function mapping '%1' in -tr-function-alias is missing the '='.\n").arg(pair));
diff --git a/src/linguist/shared/po.cpp b/src/linguist/shared/po.cpp
index 19ba12b96..69062b772 100644
--- a/src/linguist/shared/po.cpp
+++ b/src/linguist/shared/po.cpp
@@ -548,7 +548,7 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd)
                 QString xrefs;
                 foreach (const QString &ref,
                          codec->toUnicode(item.references).split(
-                                 QRegExp(QLatin1String("\\s")), QString::SkipEmptyParts)) {
+                                 QRegExp(QLatin1String("\\s")), Qt::SkipEmptyParts)) {
                     int pos = ref.indexOf(QLatin1Char(':'));
                     int lpos = ref.lastIndexOf(QLatin1Char(':'));
                     if (pos != -1 && pos == lpos) {
@@ -607,7 +607,7 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd)
                 case ',': {
                     QStringList flags =
                             QString::fromLatin1(line.mid(2)).split(
-                                    QRegExp(QLatin1String("[, ]")), QString::SkipEmptyParts);
+                                    QRegExp(QLatin1String("[, ]")), Qt::SkipEmptyParts);
                     if (flags.removeOne(QLatin1String("fuzzy")))
                         item.isFuzzy = true;
                     flags.removeOne(QLatin1String("qt-format"));
@@ -750,7 +750,7 @@ bool savePO(const Translator &translator, QIODevice &dev, ConversionData &)
     out << "msgid \"\"\n";
     Translator::ExtraData headers = translator.extras();
     QStringList hdrOrder = translator.extra(QLatin1String("po-headers")).split(
-            QLatin1Char(','), QString::SkipEmptyParts);
+            QLatin1Char(','), Qt::SkipEmptyParts);
     // Keep in sync with loadPO
     addPoHeader(headers, hdrOrder, "MIME-Version", QLatin1String("1.0"));
     addPoHeader(headers, hdrOrder, "Content-Type",
diff --git a/src/linguist/shared/qmakebuiltins.cpp b/src/linguist/shared/qmakebuiltins.cpp
index 92366b9f7..180c1fa7a 100644
--- a/src/linguist/shared/qmakebuiltins.cpp
+++ b/src/linguist/shared/qmakebuiltins.cpp
@@ -768,7 +768,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
         const auto vars = values(map(args.at(0)));
         for (const ProString &var : vars) {
             // FIXME: this is inconsistent with the "there are no empty strings" dogma.
-            const auto splits = var.toQStringRef().split(sep, QString::KeepEmptyParts);
+            const auto splits = var.toQStringRef().split(sep, Qt::KeepEmptyParts);
             for (const auto &splt : splits)
                 ret << ProString(splt).setSource(var);
         }
@@ -1538,7 +1538,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
         if (args.count() == 1)
             return returnBool(isActiveConfig(args.at(0).toQStringRef()));
         const auto &mutuals = args.at(1).toQStringRef().split(QLatin1Char('|'),
-                                                              QString::SkipEmptyParts);
+                                                              Qt::SkipEmptyParts);
         const ProStringList &configs = values(statics.strCONFIG);
 
         for (int i = configs.size() - 1; i >= 0; i--) {
@@ -1572,7 +1572,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
             }
         } else {
             const auto mutuals = args.at(2).toQStringRef().split(QLatin1Char('|'),
-                                                                 QString::SkipEmptyParts);
+                                                                 Qt::SkipEmptyParts);
             for (int i = l.size() - 1; i >= 0; i--) {
                 const ProString &val = l[i];
                 for (int mut = 0; mut < mutuals.count(); mut++) {
diff --git a/src/linguist/shared/qmakeevaluator.cpp b/src/linguist/shared/qmakeevaluator.cpp
index 639114d20..9e3fbf3e0 100644
--- a/src/linguist/shared/qmakeevaluator.cpp
+++ b/src/linguist/shared/qmakeevaluator.cpp
@@ -883,7 +883,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProVariable(
             return ReturnTrue;
         }
         QChar sep = val.at(1);
-        auto func = val.split(sep, QString::KeepEmptyParts);
+        auto func = val.split(sep, Qt::KeepEmptyParts);
         if (func.count() < 3 || func.count() > 4) {
             evalError(fL1S("The s/// function expects 3 or 4 arguments."));
             return ReturnTrue;
@@ -1022,7 +1022,7 @@ static ProString msvcArchitecture(const QString &vcInstallDir, const QString &pa
     QString vcBinDir = vcInstallDir;
     if (vcBinDir.endsWith(QLatin1Char('\\')))
         vcBinDir.chop(1);
-    const auto dirs = pathVar.split(QLatin1Char(';'), QString::SkipEmptyParts);
+    const auto dirs = pathVar.split(QLatin1Char(';'), Qt::SkipEmptyParts);
     for (const QString &dir : dirs) {
         if (!dir.startsWith(vcBinDir, Qt::CaseInsensitive))
             continue;
diff --git a/src/linguist/shared/qmakeglobals.cpp b/src/linguist/shared/qmakeglobals.cpp
index 6ba7abf28..0a58e9e29 100644
--- a/src/linguist/shared/qmakeglobals.cpp
+++ b/src/linguist/shared/qmakeglobals.cpp
@@ -261,7 +261,7 @@ QStringList QMakeGlobals::splitPathList(const QString &val) const
     QStringList ret;
     if (!val.isEmpty()) {
         QString cwd(QDir::currentPath());
-        const QStringList vals = val.split(dirlist_sep, QString::SkipEmptyParts);
+        const QStringList vals = val.split(dirlist_sep, Qt::SkipEmptyParts);
         ret.reserve(vals.length());
         for (const QString &it : vals)
             ret << IoUtils::resolvePath(cwd, it);