All: Use Utils::SkipEmptyParts

Task-number: QTCREATORBUG-24098
Change-Id: Iab45de9a9c17ddc39a0e343b1175d4f6cb94b098
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

8 files changed, 17 insertions, 12 deletions

diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp
index 2bada42658..9b19eafc8e 100644
--- a/src/plugins/projectexplorer/customtoolchain.cpp
+++ b/src/plugins/projectexplorer/customtoolchain.cpp
@@ -40,6 +40,7 @@
 #include <utils/environment.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QComboBox>
 #include <QFormLayout>
@@ -428,7 +429,7 @@ public:
 
     QStringList entries() const
     {
-        return textEditWidget()->toPlainText().split(QLatin1Char('\n'), QString::SkipEmptyParts);
+        return textEditWidget()->toPlainText().split(QLatin1Char('\n'), Utils::SkipEmptyParts);
     }
 
     QString text() const
@@ -547,7 +548,7 @@ void CustomToolChainConfigWidget::applyImpl()
     tc->setMakeCommand(m_makeCommand->filePath());
     tc->setTargetAbi(m_abiWidget->currentAbi());
     Macros macros = Utils::transform<QVector>(
-                m_predefinedDetails->text().split('\n', QString::SkipEmptyParts),
+                m_predefinedDetails->text().split('\n', Utils::SkipEmptyParts),
                 [](const QString &m) {
         return Macro::fromKeyValue(m);
     });
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
index 6c5c6cdb3a..323c0d6100 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
@@ -29,12 +29,13 @@
 #include <coreplugin/icore.h>
 #include <cpptools/cpptoolsconstants.h>
 
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/macroexpander.h>
+#include <utils/mimetypes/mimedatabase.h>
+#include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 #include <utils/templateengine.h>
 #include <utils/temporarydirectory.h>
 #include <utils/temporaryfile.h>
-#include <utils/qtcassert.h>
 
 #include <QCoreApplication>
 #include <QDate>
@@ -450,7 +451,7 @@ static inline IWizardFactory::WizardKind kindAttribute(const QXmlStreamReader &r
 static inline QSet<Id> readRequiredFeatures(const QXmlStreamReader &reader)
 {
     QString value = reader.attributes().value(QLatin1String(featuresRequiredC)).toString();
-    QStringList stringList = value.split(QLatin1Char(','), QString::SkipEmptyParts);
+    QStringList stringList = value.split(QLatin1Char(','), Utils::SkipEmptyParts);
     QSet<Id> features;
     foreach (const QString &string, stringList)
         features |= Id::fromString(string);
diff --git a/src/plugins/projectexplorer/environmentwidget.cpp b/src/plugins/projectexplorer/environmentwidget.cpp
index d2417a81b2..70269e49ca 100644
--- a/src/plugins/projectexplorer/environmentwidget.cpp
+++ b/src/plugins/projectexplorer/environmentwidget.cpp
@@ -37,6 +37,7 @@
 #include <utils/itemviews.h>
 #include <utils/namevaluevalidator.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 #include <utils/tooltip/tooltip.h>
 
 #include <QDialogButtonBox>
@@ -82,7 +83,7 @@ public:
         m_view.setHeaderLabel(varName);
         m_view.setDragDropMode(QAbstractItemView::InternalMove);
         const QStringList pathList = paths.split(Utils::HostOsInfo::pathListSeparator(),
-                                                 QString::SkipEmptyParts);
+                                                 Utils::SkipEmptyParts);
         for (const QString &path : pathList)
             addPath(path);
 
@@ -442,7 +443,7 @@ bool EnvironmentWidget::currentEntryIsPathList(const QModelIndex &current) const
     if (valueIndex.column() == 0)
         valueIndex = valueIndex.siblingAtColumn(1);
     const QStringList entries = d->m_model->data(valueIndex).toString()
-            .split(Utils::HostOsInfo::pathListSeparator(), QString::SkipEmptyParts);
+            .split(Utils::HostOsInfo::pathListSeparator(), Utils::SkipEmptyParts);
     if (entries.length() < 2)
         return false;
     for (const QString &potentialDir : entries) {
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
index ab99fa4de9..fdb68958b8 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
@@ -39,6 +39,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QDir>
 #include <QMessageBox>
@@ -209,7 +210,7 @@ void JsonSummaryPage::addToProject(const JsonWizard::GeneratorFiles &files)
             return;
         }
         const QStringList dependencies = m_wizard->stringValue("Dependencies")
-                .split(':', QString::SkipEmptyParts);
+                .split(':', Utils::SkipEmptyParts);
         if (!dependencies.isEmpty())
             folder->addDependencies(dependencies);
     }
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
index a9fb2b54a8..0d46128e12 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
@@ -324,7 +324,7 @@ static QStringList environmentTemplatesPaths()
 
     if (!envTempPath.isEmpty()) {
         for (const QString &path : envTempPath
-             .split(Utils::HostOsInfo::pathListSeparator(), QString::SkipEmptyParts)) {
+             .split(Utils::HostOsInfo::pathListSeparator(), Utils::SkipEmptyParts)) {
             QString canonicalPath = QDir(path).canonicalPath();
             if (!canonicalPath.isEmpty() && !paths.contains(canonicalPath))
                 paths.append(canonicalPath);
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index e0c9f82b41..c873fa8014 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2014,7 +2014,7 @@ void ProjectExplorerPlugin::extensionsInitialized()
             const QString gitBinary = Core::ICore::settings()->value("Git/BinaryPath", "git")
                     .toString();
             const QStringList rawGitSearchPaths = Core::ICore::settings()->value("Git/Path")
-                    .toString().split(':', QString::SkipEmptyParts);
+                    .toString().split(':', Utils::SkipEmptyParts);
             const Utils::FilePaths gitSearchPaths = Utils::transform(rawGitSearchPaths,
                     [](const QString &rawPath) { return Utils::FilePath::fromString(rawPath); });
             const Utils::FilePath fullGitPath = Utils::Environment::systemEnvironment()
diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index d9dba7d710..173f4bb8fa 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -79,7 +79,7 @@ static FolderNode *recursiveFindOrCreateFolderNode(FolderNode *folder,
             directoryWithoutPrefix = directory;
         }
     }
-    QStringList parts = directoryWithoutPrefix.toString().split('/', QString::SkipEmptyParts);
+    QStringList parts = directoryWithoutPrefix.toString().split('/', Utils::SkipEmptyParts);
     if (!Utils::HostOsInfo::isWindowsHost() && !isRelative && !parts.isEmpty())
         parts[0].prepend('/');
 
diff --git a/src/plugins/projectexplorer/selectablefilesmodel.cpp b/src/plugins/projectexplorer/selectablefilesmodel.cpp
index 7917bbe08c..551a4b8fb4 100644
--- a/src/plugins/projectexplorer/selectablefilesmodel.cpp
+++ b/src/plugins/projectexplorer/selectablefilesmodel.cpp
@@ -33,6 +33,7 @@
 #include <utils/fancylineedit.h>
 #include <utils/pathchooser.h>
 #include <utils/runextensions.h>
+#include <utils/stringutils.h>
 
 #include <QDialogButtonBox>
 #include <QDir>
@@ -349,7 +350,7 @@ void SelectableFilesModel::collectFiles(Tree *root, Utils::FilePaths *result) co
 QList<Glob> SelectableFilesModel::parseFilter(const QString &filter)
 {
     QList<Glob> result;
-    const QStringList list = filter.split(QLatin1Char(';'), QString::SkipEmptyParts);
+    const QStringList list = filter.split(QLatin1Char(';'), Utils::SkipEmptyParts);
     for (const QString &e : list) {
         QString entry = e.trimmed();
         Glob g;