From 51d00709a584f39898a3c112af28e3bc7660ccae Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 10 Mar 2022 10:20:54 +0100
Subject: Utils: Drop [Qt::]SkipEmptyParts from porting.h

Not needed anymore after 7c942cfd188.

Change-Id: I5e6021cb64a399fa3bc3067b2fcd60ab48587daa
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/libs/advanceddockingsystem/dockoverlay.cpp |  5 ++---
 src/libs/utils/environment.cpp                 |  2 +-
 src/libs/utils/porting.h                       |  2 --
 src/libs/utils/stringutils.h                   |  2 --
 src/plugins/cvs/cvsplugin.cpp                  | 17 ++++++++---------
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/libs/advanceddockingsystem/dockoverlay.cpp b/src/libs/advanceddockingsystem/dockoverlay.cpp
index 904425ef13..f98c3fbd5f 100644
--- a/src/libs/advanceddockingsystem/dockoverlay.cpp
+++ b/src/libs/advanceddockingsystem/dockoverlay.cpp
@@ -39,7 +39,6 @@
 #include "dockareatitlebar.h"
 
 #include <utils/hostosinfo.h>
-#include <utils/porting.h>
 
 #include <QCursor>
 #include <QGridLayout>
@@ -759,9 +758,9 @@ namespace ADS {
                                     {"Arrow", DockOverlayCross::ArrowColor},
                                     {"Shadow", DockOverlayCross::ShadowColor}};
 
-        auto colorList = colors.split(' ', Utils::SkipEmptyParts);
+        auto colorList = colors.split(' ', Qt::SkipEmptyParts);
         for (const auto &colorListEntry : colorList) {
-            auto componentColor = colorListEntry.split('=', Utils::SkipEmptyParts);
+            auto componentColor = colorListEntry.split('=', Qt::SkipEmptyParts);
             int component = colorCompenentStringMap.value(componentColor[0], -1);
             if (component < 0)
                 continue;
diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp
index 7b0a48c6a8..48e525d522 100644
--- a/src/libs/utils/environment.cpp
+++ b/src/libs/utils/environment.cpp
@@ -310,7 +310,7 @@ FilePaths Environment::path() const
 FilePaths Environment::pathListValue(const QString &varName) const
 {
     const QStringList pathComponents = expandedValueForKey(varName).split(
-        OsSpecificAspects::pathListSeparator(m_osType), SkipEmptyParts);
+        OsSpecificAspects::pathListSeparator(m_osType), Qt::SkipEmptyParts);
     return transform(pathComponents, &FilePath::fromUserInput);
 }
 
diff --git a/src/libs/utils/porting.h b/src/libs/utils/porting.h
index da2aed4b43..c84ea60dfb 100644
--- a/src/libs/utils/porting.h
+++ b/src/libs/utils/porting.h
@@ -34,8 +34,6 @@
 
 namespace Utils {
 
-constexpr Qt::SplitBehaviorFlags SkipEmptyParts = Qt::SkipEmptyParts;
-
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 using QHashValueType = uint;
 #else
diff --git a/src/libs/utils/stringutils.h b/src/libs/utils/stringutils.h
index 9a8cf8f964..70cf673895 100644
--- a/src/libs/utils/stringutils.h
+++ b/src/libs/utils/stringutils.h
@@ -27,8 +27,6 @@
 
 #include "utils_global.h"
 
-#include "porting.h"
-
 #include <QList>
 #include <QString>
 
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 775978b780..b3190d872f 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -42,11 +42,6 @@
 
 #include <texteditor/textdocument.h>
 
-#include <utils/parameteraction.h>
-#include <utils/qtcassert.h>
-#include <utils/qtcprocess.h>
-#include <utils/stringutils.h>
-
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/documentmanager.h>
@@ -58,18 +53,22 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/locator/commandlocator.h>
 #include <coreplugin/vcsmanager.h>
+
 #include <utils/fileutils.h>
+#include <utils/parameteraction.h>
+#include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/stringutils.h>
 
-#include <QDebug>
+#include <QAction>
 #include <QDate>
+#include <QDebug>
 #include <QDir>
 #include <QFileInfo>
-#include <QTextCodec>
-#include <QAction>
 #include <QMainWindow>
 #include <QMenu>
 #include <QMessageBox>
+#include <QTextCodec>
 
 #ifdef WITH_TESTS
 #include <QTest>
@@ -181,7 +180,7 @@ public:
 
     QStringList arguments() const override
     {
-        QStringList args = m_settings.diffOptions.value().split(' ', SkipEmptyParts);
+        QStringList args = m_settings.diffOptions.value().split(' ', Qt::SkipEmptyParts);
         args += VcsBaseEditorConfig::arguments();
         return args;
     }
-- 
cgit v1.2.1