feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Drop [Qt::]SkipEmptyParts from porting.h

Browse Source 
Not needed anymore after 7c942cfd18.

Change-Id: I5e6021cb64a399fa3bc3067b2fcd60ab48587daa
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2022-03-10 10:20:54 +01:00
parent 17acd5b225
commit 51d00709a5
5 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/advanceddockingsystem/dockoverlay.cpp
View File

@@ -39,7 +39,6 @@
#include "dockareatitlebar.h" #include "dockareatitlebar.h"
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/porting.h>
#include <QCursor> #include <QCursor>
#include <QGridLayout> #include <QGridLayout>
@@ -759,9 +758,9 @@ namespace ADS {
{"Arrow", DockOverlayCross::ArrowColor}, {"Arrow", DockOverlayCross::ArrowColor},
{"Shadow", DockOverlayCross::ShadowColor}}; {"Shadow", DockOverlayCross::ShadowColor}};
auto colorList = colors.split(' ', Utils::SkipEmptyParts); auto colorList = colors.split(' ', Qt::SkipEmptyParts);
for (const auto &colorListEntry : colorList) { for (const auto &colorListEntry : colorList) {
auto componentColor = colorListEntry.split('=', Utils::SkipEmptyParts); auto componentColor = colorListEntry.split('=', Qt::SkipEmptyParts);
int component = colorCompenentStringMap.value(componentColor[0], -1); int component = colorCompenentStringMap.value(componentColor[0], -1);
if (component < 0) if (component < 0)
continue; continue;

2
src/libs/utils/environment.cpp
View File

@@ -310,7 +310,7 @@ FilePaths Environment::path() const
FilePaths Environment::pathListValue(const QString &varName) const FilePaths Environment::pathListValue(const QString &varName) const
{ {
const QStringList pathComponents = expandedValueForKey(varName).split( const QStringList pathComponents = expandedValueForKey(varName).split(
OsSpecificAspects::pathListSeparator(m_osType), SkipEmptyParts); OsSpecificAspects::pathListSeparator(m_osType), Qt::SkipEmptyParts);
return transform(pathComponents, &FilePath::fromUserInput); return transform(pathComponents, &FilePath::fromUserInput);
} }

2
src/libs/utils/porting.h
View File

@@ -34,8 +34,6 @@
namespace Utils { namespace Utils {
constexpr Qt::SplitBehaviorFlags SkipEmptyParts = Qt::SkipEmptyParts;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
using QHashValueType = uint; using QHashValueType = uint;
#else #else

2
src/libs/utils/stringutils.h
View File

@@ -27,8 +27,6 @@
#include "utils_global.h" #include "utils_global.h"
#include "porting.h"
#include <QList> #include <QList>
#include <QString> #include <QString>

17
src/plugins/cvs/cvsplugin.cpp
View File

@@ -42,11 +42,6 @@
#include <texteditor/textdocument.h> #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/icore.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/documentmanager.h> #include <coreplugin/documentmanager.h>
@@ -58,18 +53,22 @@
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/locator/commandlocator.h> #include <coreplugin/locator/commandlocator.h>
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/parameteraction.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/stringutils.h> #include <utils/stringutils.h>
#include <QDebug> #include <QAction>
#include <QDate> #include <QDate>
#include <QDebug>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QTextCodec>
#include <QAction>
#include <QMainWindow> #include <QMainWindow>
#include <QMenu> #include <QMenu>
#include <QMessageBox> #include <QMessageBox>
#include <QTextCodec>
#ifdef WITH_TESTS #ifdef WITH_TESTS
#include <QTest> #include <QTest>
@@ -181,7 +180,7 @@ public:
QStringList arguments() const override QStringList arguments() const override
{ {
QStringList args = m_settings.diffOptions.value().split(' ', SkipEmptyParts); QStringList args = m_settings.diffOptions.value().split(' ', Qt::SkipEmptyParts);
args += VcsBaseEditorConfig::arguments(); args += VcsBaseEditorConfig::arguments();
return args; return args;
} }