forked from qt-creator/qt-creator
All: Use Utils::SkipEmptyParts
Task-number: QTCREATORBUG-24098 Change-Id: Iab45de9a9c17ddc39a0e343b1175d4f6cb94b098 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user