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

Use Qt::SkipEmptyParts unconditionally

Browse Source 
Squashes a warning in qmldebugtranslationwidget and is safe to use
with Qt 5.14.

Change-Id: I1912e7379a570a17fbf057b87390a63d524ced49
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-08-14 07:22:30 +02:00
parent 760d91665f
commit e62044aa29
3 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/3rdparty/syntax-highlighting/src/lib/definition.cpp vendored
View File

@@ -470,18 +470,10 @@ bool DefinitionData::loadMetaData(const QString &file, const QCborMap &obj)
fileName = file; fileName = file;
const auto exts = obj.value(QLatin1String("extensions")).toString(); const auto exts = obj.value(QLatin1String("extensions")).toString();
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
for (const auto &ext : exts.split(QLatin1Char(';'), QString::SkipEmptyParts))
#else
for (const auto &ext : exts.split(QLatin1Char(';'), Qt::SkipEmptyParts)) for (const auto &ext : exts.split(QLatin1Char(';'), Qt::SkipEmptyParts))
#endif
extensions.push_back(ext); extensions.push_back(ext);
const auto mts = obj.value(QLatin1String("mimetype")).toString(); const auto mts = obj.value(QLatin1String("mimetype")).toString();
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
for (const auto &mt : mts.split(QLatin1Char(';'), QString::SkipEmptyParts))
#else
for (const auto &mt : mts.split(QLatin1Char(';'), Qt::SkipEmptyParts)) for (const auto &mt : mts.split(QLatin1Char(';'), Qt::SkipEmptyParts))
#endif
mimetypes.push_back(mt); mimetypes.push_back(mt);
return true; return true;
@@ -506,18 +498,10 @@ bool DefinitionData::loadLanguage(QXmlStreamReader &reader)
author = reader.attributes().value(QStringLiteral("author")).toString(); author = reader.attributes().value(QStringLiteral("author")).toString();
license = reader.attributes().value(QStringLiteral("license")).toString(); license = reader.attributes().value(QStringLiteral("license")).toString();
const auto exts = reader.attributes().value(QStringLiteral("extensions")).toString(); const auto exts = reader.attributes().value(QStringLiteral("extensions")).toString();
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
for (const auto &ext : exts.split(QLatin1Char(';'), QString::SkipEmptyParts))
#else
for (const auto &ext : exts.split(QLatin1Char(';'), Qt::SkipEmptyParts)) for (const auto &ext : exts.split(QLatin1Char(';'), Qt::SkipEmptyParts))
#endif
extensions.push_back(ext); extensions.push_back(ext);
const auto mts = reader.attributes().value(QStringLiteral("mimetype")).toString(); const auto mts = reader.attributes().value(QStringLiteral("mimetype")).toString();
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
for (const auto &mt : mts.split(QLatin1Char(';'), QString::SkipEmptyParts))
#else
for (const auto &mt : mts.split(QLatin1Char(';'), Qt::SkipEmptyParts)) for (const auto &mt : mts.split(QLatin1Char(';'), Qt::SkipEmptyParts))
#endif
mimetypes.push_back(mt); mimetypes.push_back(mt);
if (reader.attributes().hasAttribute(QStringLiteral("casesensitive"))) if (reader.attributes().hasAttribute(QStringLiteral("casesensitive")))
caseSensitive = Xml::attrToBool(reader.attributes().value(QStringLiteral("casesensitive"))) ? Qt::CaseSensitive : Qt::CaseInsensitive; caseSensitive = Xml::attrToBool(reader.attributes().value(QStringLiteral("casesensitive"))) ? Qt::CaseSensitive : Qt::CaseInsensitive;

7
src/plugins/help/qlitehtml/container_qpainter.cpp
View File

@@ -446,12 +446,7 @@ litehtml::uint_ptr DocumentContainer::create_font(const litehtml::tchar_t *faceN
unsigned int decoration, unsigned int decoration,
litehtml::font_metrics *fm) litehtml::font_metrics *fm)
{ {
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) const QStringList splitNames = QString::fromUtf8(faceName).split(',', Qt::SkipEmptyParts);
constexpr auto SkipEmptyParts = QString::SkipEmptyParts;
#else
constexpr auto SkipEmptyParts = Qt::SkipEmptyParts;
#endif
const QStringList splitNames = QString::fromUtf8(faceName).split(',', SkipEmptyParts);
QStringList familyNames; QStringList familyNames;
std::transform(splitNames.cbegin(), std::transform(splitNames.cbegin(),
splitNames.cend(), splitNames.cend(),

2
src/plugins/qmlpreview/qmldebugtranslationwidget.cpp
View File

@@ -391,7 +391,7 @@ void QmlDebugTranslationWidget::saveLogToFile()
void QmlDebugTranslationWidget::appendMessage(const QString &message, Utils::OutputFormat format) void QmlDebugTranslationWidget::appendMessage(const QString &message, Utils::OutputFormat format)
{ {
const auto newLine = QRegularExpression("[\r\n]"); const auto newLine = QRegularExpression("[\r\n]");
const auto messages = message.split(newLine, QString::SkipEmptyParts); const auto messages = message.split(newLine, Qt::SkipEmptyParts);
if (messages.count() > 1) { if (messages.count() > 1) {
for (auto m : messages) for (auto m : messages)