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

Update mime database from Qt

Browse Source 
qtbase/8037d4f4eb773d4875b086eff218b25cd84d3c52
  qmimeprovider: use view types more

Change-Id: I0887ef8964af4143bc584396ccb9cd29be21e123
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2024-08-29 10:07:01 +02:00
parent 63df2d32bb
commit ae7384eff3
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/utils/mimetypes2/mimeprovider.cpp
View File

@@ -482,13 +482,14 @@ void MimeBinaryProvider::loadMimeTypeList()
m_mimetypeNames.clear(); m_mimetypeNames.clear();
// Unfortunately mime.cache doesn't have a full list of all mimetypes. // Unfortunately mime.cache doesn't have a full list of all mimetypes.
// So we have to parse the plain-text files called "types". // 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)) { if (file.open(QIODevice::ReadOnly)) {
while (!file.atEnd()) { while (!file.atEnd()) {
QByteArray line = file.readLine(); const QByteArray line = file.readLine();
if (line.endsWith('\n')) auto lineView = QByteArrayView(line);
line.chop(1); if (lineView.endsWith('\n'))
m_mimetypeNames.insert(QString::fromLatin1(line)); 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() void MimeXMLProvider::ensureLoaded()
{ {
QStringList allFiles; QStringList allFiles;
const QString packageDir = m_directory + QStringLiteral("/packages"); const QString packageDir = m_directory + QStringView(u"/packages");
QDir dir(packageDir); QDir dir(packageDir);
const QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot); const QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot);
allFiles.reserve(files.size()); allFiles.reserve(files.size());