From ae7384eff3de2f86a3099a083b960b92499d8ceb Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 29 Aug 2024 10:07:01 +0200 Subject: [PATCH] Update mime database from Qt qtbase/8037d4f4eb773d4875b086eff218b25cd84d3c52 qmimeprovider: use view types more Change-Id: I0887ef8964af4143bc584396ccb9cd29be21e123 Reviewed-by: Jarek Kobus --- src/libs/utils/mimetypes2/mimeprovider.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/mimetypes2/mimeprovider.cpp b/src/libs/utils/mimetypes2/mimeprovider.cpp index 97fc0cfb99e..c0266ffd86c 100644 --- a/src/libs/utils/mimetypes2/mimeprovider.cpp +++ b/src/libs/utils/mimetypes2/mimeprovider.cpp @@ -482,13 +482,14 @@ void MimeBinaryProvider::loadMimeTypeList() m_mimetypeNames.clear(); // Unfortunately mime.cache doesn't have a full list of all mimetypes. // So we have to parse the plain-text files called "types". - QFile file(m_directory + QStringLiteral("/types")); + QFile file(m_directory + QStringView(u"/types")); if (file.open(QIODevice::ReadOnly)) { while (!file.atEnd()) { - QByteArray line = file.readLine(); - if (line.endsWith('\n')) - line.chop(1); - m_mimetypeNames.insert(QString::fromLatin1(line)); + const QByteArray line = file.readLine(); + auto lineView = QByteArrayView(line); + if (lineView.endsWith('\n')) + lineView.chop(1); + m_mimetypeNames.insert(QString::fromLatin1(lineView)); } } } @@ -759,7 +760,7 @@ void MimeXMLProvider::findByMagic(const QByteArray &data, int *accuracyPtr, Mime void MimeXMLProvider::ensureLoaded() { QStringList allFiles; - const QString packageDir = m_directory + QStringLiteral("/packages"); + const QString packageDir = m_directory + QStringView(u"/packages"); QDir dir(packageDir); const QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot); allFiles.reserve(files.size());