aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/coreplugin
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-06-17 06:35:31 +0200
committerhjk <hjk@qt.io>2020-06-17 05:55:25 +0000
commit1c81a3b3e887d9774cc342caafccebd7cdb90f19 (patch)
tree7008ebd0f4d8de1299dfc5d734832175d7a4624f /src/plugins/coreplugin
parent6e798401a0558ad039fff62b80e97660053b60b8 (diff)
All: Use Utils::SkipEmptyParts
Task-number: QTCREATORBUG-24098 Change-Id: Iab45de9a9c17ddc39a0e343b1175d4f6cb94b098 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/coreplugin')
-rw-r--r--src/plugins/coreplugin/locator/urllocatorfilter.cpp4
-rw-r--r--src/plugins/coreplugin/menubarfilter.cpp2
-rw-r--r--src/plugins/coreplugin/mimetypesettings.cpp5
3 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/coreplugin/locator/urllocatorfilter.cpp b/src/plugins/coreplugin/locator/urllocatorfilter.cpp
index c567e810d7..355804f152 100644
--- a/src/plugins/coreplugin/locator/urllocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/urllocatorfilter.cpp
@@ -25,6 +25,8 @@
#include "urllocatorfilter.h"
+#include <utils/stringutils.h>
+
#include <QDesktopServices>
#include <QMutexLocker>
#include <QUrl>
@@ -190,7 +192,7 @@ void UrlLocatorFilter::restoreState(const QByteArray &state)
QString value;
in >> value;
- m_remoteUrls = value.split('^', QString::SkipEmptyParts);
+ m_remoteUrls = value.split('^', Utils::SkipEmptyParts);
QString shortcut;
in >> shortcut;
diff --git a/src/plugins/coreplugin/menubarfilter.cpp b/src/plugins/coreplugin/menubarfilter.cpp
index dc8de54614..6b8181b3ff 100644
--- a/src/plugins/coreplugin/menubarfilter.cpp
+++ b/src/plugins/coreplugin/menubarfilter.cpp
@@ -187,7 +187,7 @@ void Core::Internal::MenuBarFilter::prepareSearch(const QString &entry)
static const QRegularExpression seperatorRegExp(QString("[%1]").arg(separators));
QString normalized = entry;
normalized.replace(seperatorRegExp, separators.at(0));
- const QStringList entryPath = normalized.split(separators.at(0), QString::SkipEmptyParts);
+ const QStringList entryPath = normalized.split(separators.at(0), Utils::SkipEmptyParts);
m_entries.clear();
QVector<const QMenu *> processedMenus;
for (QAction* action : menuBarActions())
diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp
index 83ed2a278b..b179c62424 100644
--- a/src/plugins/coreplugin/mimetypesettings.cpp
+++ b/src/plugins/coreplugin/mimetypesettings.cpp
@@ -37,6 +37,7 @@
#include <utils/headerviewstretcher.h>
#include <utils/mimetypes/mimedatabase.h>
#include <utils/qtcassert.h>
+#include <utils/stringutils.h>
#include <QAbstractTableModel>
#include <QCoreApplication>
@@ -381,7 +382,7 @@ void MimeTypeSettingsPrivate::handlePatternEdited()
const Utils::MimeType mt = m_model->m_mimeTypes.at(index);
ensurePendingMimeType(mt);
m_pendingModifiedMimeTypes[mt.name()].globPatterns
- = m_ui.patternsLineEdit->text().split(kSemiColon, QString::SkipEmptyParts);
+ = m_ui.patternsLineEdit->text().split(kSemiColon, Utils::SkipEmptyParts);
}
void MimeTypeSettingsPrivate::addMagicHeaderRow(const MagicData &data)
@@ -578,7 +579,7 @@ MimeTypeSettingsPrivate::UserMimeTypeHash MimeTypeSettingsPrivate::readUserModif
if (reader.name() == QLatin1String(mimeTypeTagC)) {
mt.name = atts.value(QLatin1String(mimeTypeAttributeC)).toString();
mt.globPatterns = atts.value(QLatin1String(patternAttributeC)).toString()
- .split(kSemiColon, QString::SkipEmptyParts);
+ .split(kSemiColon, Utils::SkipEmptyParts);
} else if (reader.name() == QLatin1String(matchTagC)) {
QByteArray value = atts.value(QLatin1String(matchValueAttributeC)).toUtf8();
QByteArray typeName = atts.value(QLatin1String(matchTypeAttributeC)).toUtf8();