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/1c6bf3e09ea9722717caedcfcceaaf3d607615cf
  Port from container::count() and length() to size() - V5

Change-Id: I6ce5083c6e59eb9ee281e4f4812fdf544c1c9ca7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2024-08-27 11:50:13 +02:00
parent c2b0f91d0b
commit 1045db6791
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/mimetypes2/mimedatabase.cpp
View File

@@ -423,7 +423,7 @@ MimeType MimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileName
// Pass 1) Try to match on the file name // Pass 1) Try to match on the file name
MimeGlobMatchResult candidatesByName = findByFileName(fileName); MimeGlobMatchResult candidatesByName = findByFileName(fileName);
if (candidatesByName.m_allMatchingMimeTypes.count() == 1) { if (candidatesByName.m_allMatchingMimeTypes.size() == 1) {
const MimeType mime = mimeTypeForName(candidatesByName.m_matchingMimeTypes.at(0)); const MimeType mime = mimeTypeForName(candidatesByName.m_matchingMimeTypes.at(0));
if (mime.isValid()) if (mime.isValid())
return mime; return mime;
@@ -461,7 +461,7 @@ MimeType MimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileName
} }
} }
if (candidatesByName.m_allMatchingMimeTypes.count() > 1) { if (candidatesByName.m_allMatchingMimeTypes.size() > 1) {
candidatesByName.m_matchingMimeTypes.sort(); // make it deterministic candidatesByName.m_matchingMimeTypes.sort(); // make it deterministic
const MimeType mime = mimeTypeForName(candidatesByName.m_matchingMimeTypes.at(0)); const MimeType mime = mimeTypeForName(candidatesByName.m_matchingMimeTypes.at(0));
if (mime.isValid()) if (mime.isValid())
@@ -719,7 +719,7 @@ QList<MimeType> MimeDatabase::mimeTypesForFileName(const QString &fileName) cons
const QStringList matches = d->mimeTypeForFileName(fileName); const QStringList matches = d->mimeTypeForFileName(fileName);
QList<MimeType> mimes; QList<MimeType> mimes;
mimes.reserve(matches.count()); mimes.reserve(matches.size());
for (const QString &mime : matches) for (const QString &mime : matches)
mimes.append(d->mimeTypeForName(mime)); mimes.append(d->mimeTypeForName(mime));
return mimes; return mimes;

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

@@ -747,7 +747,7 @@ void MimeXMLProvider::ensureLoaded()
const QString packageDir = m_directory + QStringLiteral("/packages"); const QString packageDir = m_directory + QStringLiteral("/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.count()); allFiles.reserve(files.size());
for (const QString &xmlFile : files) for (const QString &xmlFile : files)
allFiles.append(packageDir + u'/' + xmlFile); allFiles.append(packageDir + u'/' + xmlFile);