From e62044aa29b14b5db9229ec5b72cd4c4a7fa64c6 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 14 Aug 2020 07:22:30 +0200 Subject: [PATCH] Use Qt::SkipEmptyParts unconditionally Squashes a warning in qmldebugtranslationwidget and is safe to use with Qt 5.14. Change-Id: I1912e7379a570a17fbf057b87390a63d524ced49 Reviewed-by: Christian Stenger --- .../syntax-highlighting/src/lib/definition.cpp | 16 ---------------- .../help/qlitehtml/container_qpainter.cpp | 7 +------ .../qmlpreview/qmldebugtranslationwidget.cpp | 2 +- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/definition.cpp b/src/libs/3rdparty/syntax-highlighting/src/lib/definition.cpp index 1bb5e3d2702..913a74da088 100644 --- a/src/libs/3rdparty/syntax-highlighting/src/lib/definition.cpp +++ b/src/libs/3rdparty/syntax-highlighting/src/lib/definition.cpp @@ -470,18 +470,10 @@ bool DefinitionData::loadMetaData(const QString &file, const QCborMap &obj) fileName = file; 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)) -#endif extensions.push_back(ext); 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)) -#endif mimetypes.push_back(mt); return true; @@ -506,18 +498,10 @@ bool DefinitionData::loadLanguage(QXmlStreamReader &reader) author = reader.attributes().value(QStringLiteral("author")).toString(); license = reader.attributes().value(QStringLiteral("license")).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)) -#endif extensions.push_back(ext); 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)) -#endif mimetypes.push_back(mt); if (reader.attributes().hasAttribute(QStringLiteral("casesensitive"))) caseSensitive = Xml::attrToBool(reader.attributes().value(QStringLiteral("casesensitive"))) ? Qt::CaseSensitive : Qt::CaseInsensitive; diff --git a/src/plugins/help/qlitehtml/container_qpainter.cpp b/src/plugins/help/qlitehtml/container_qpainter.cpp index af0dd9a65c3..b1b7865d828 100644 --- a/src/plugins/help/qlitehtml/container_qpainter.cpp +++ b/src/plugins/help/qlitehtml/container_qpainter.cpp @@ -446,12 +446,7 @@ litehtml::uint_ptr DocumentContainer::create_font(const litehtml::tchar_t *faceN unsigned int decoration, litehtml::font_metrics *fm) { -#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) - constexpr auto SkipEmptyParts = QString::SkipEmptyParts; -#else - constexpr auto SkipEmptyParts = Qt::SkipEmptyParts; -#endif - const QStringList splitNames = QString::fromUtf8(faceName).split(',', SkipEmptyParts); + const QStringList splitNames = QString::fromUtf8(faceName).split(',', Qt::SkipEmptyParts); QStringList familyNames; std::transform(splitNames.cbegin(), splitNames.cend(), diff --git a/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp b/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp index 3de3eff2c21..b71575622d2 100644 --- a/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp +++ b/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp @@ -391,7 +391,7 @@ void QmlDebugTranslationWidget::saveLogToFile() void QmlDebugTranslationWidget::appendMessage(const QString &message, Utils::OutputFormat format) { 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) { for (auto m : messages)