All: Use Utils::SkipEmptyParts

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

src/plugins/help/localhelpmanager.cpp

@@ -46,16 +46,17 @@
 
 #include <app/app_version.h>
 #include <coreplugin/icore.h>
+
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
 #include <utils/optional.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QDesktopServices>
 #include <QFontDatabase>
-#include <QMutexLocker>
-
 #include <QHelpEngine>
+#include <QMutexLocker>
 
 using namespace Help::Internal;
 
@@ -269,7 +270,7 @@ void LocalHelpManager::setScrollWheelZoomingEnabled(bool enabled)
 QStringList LocalHelpManager::lastShownPages()
 {
     const QVariant value = Core::ICore::settings()->value(kLastShownPagesKey, QVariant());
-    return value.toString().split(Constants::ListSeparator, QString::SkipEmptyParts);
+    return value.toString().split(Constants::ListSeparator, Utils::SkipEmptyParts);
 }
 
 void LocalHelpManager::setLastShownPages(const QStringList &pages)
@@ -281,7 +282,7 @@ QList<float> LocalHelpManager::lastShownPagesZoom()
 {
     const QVariant value = Core::ICore::settings()->value(kLastShownPagesZoomKey, QVariant());
     const QStringList stringValues = value.toString().split(Constants::ListSeparator,
-                                                            QString::SkipEmptyParts);
+                                                            Utils::SkipEmptyParts);
     return Utils::transform(stringValues, [](const QString &str) { return str.toFloat(); });
 }
 

src/plugins/help/openpagesmanager.cpp

@@ -32,6 +32,13 @@
 #include "openpagesswitcher.h"
 #include "openpageswidget.h"
 
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/modemanager.h>
+
+#include <utils/qtcassert.h>
+#include <utils/stringutils.h>
+#include <utils/styledbar.h>
+
 #include <QApplication>
 #include <QClipboard>
 #include <QComboBox>
@@ -39,10 +46,6 @@
 
 #include <QHelpEngine>
 
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/modemanager.h>
-#include <utils/qtcassert.h>
-
 using namespace Core;
 using namespace Help::Internal;
 
@@ -110,7 +113,7 @@ QComboBox *OpenPagesManager::openPagesComboBox() const
 QStringList splitString(const QVariant &value)
 {
     using namespace Help::Constants;
-    return value.toString().split(ListSeparator, QString::SkipEmptyParts);
+    return value.toString().split(ListSeparator, Utils::SkipEmptyParts);
 }
 
 void OpenPagesManager::setupInitialPages()

src/plugins/help/qlitehtml/container_qpainter.cpp

@@ -25,6 +25,8 @@
 
 #include "container_qpainter.h"
 
+#include <utils/stringutils.h>
+
 #include <QClipboard>
 #include <QCursor>
 #include <QDebug>
@@ -446,7 +448,7 @@ litehtml::uint_ptr DocumentContainer::create_font(const litehtml::tchar_t *faceN
                                                   unsigned int decoration,
                                                   litehtml::font_metrics *fm)
 {
-    const QStringList splitNames = QString::fromUtf8(faceName).split(',', QString::SkipEmptyParts);
+    const QStringList splitNames = QString::fromUtf8(faceName).split(',', Utils::SkipEmptyParts);
     QStringList familyNames;
     std::transform(splitNames.cbegin(),
                    splitNames.cend(),

src/plugins/help/searchwidget.cpp

@@ -32,7 +32,9 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
+
 #include <utils/progressindicator.h>
+#include <utils/stringutils.h>
 #include <utils/styledbar.h>
 #include <utils/utilsicons.h>
 
@@ -261,7 +263,7 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent)
 
 QStringList SearchWidget::currentSearchTerms() const
 {
-    return searchEngine->searchInput().split(QRegExp("\\W+"), QString::SkipEmptyParts);
+    return searchEngine->searchInput().split(QRegExp("\\W+"), Utils::SkipEmptyParts);
 }
 
 // #pragma mark -- SearchSideBarItem