From 1045db6791af6a80a8ab01af9330c769652a1365 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 27 Aug 2024 11:50:13 +0200
Subject: [PATCH] Update mime database from Qt

qtbase/1c6bf3e09ea9722717caedcfcceaaf3d607615cf
  Port from container::count() and length() to size() - V5

Change-Id: I6ce5083c6e59eb9ee281e4f4812fdf544c1c9ca7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/libs/utils/mimetypes2/mimedatabase.cpp | 6 +++---
 src/libs/utils/mimetypes2/mimeprovider.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libs/utils/mimetypes2/mimedatabase.cpp b/src/libs/utils/mimetypes2/mimedatabase.cpp
index ba2d3d92b91..cc89fa3ff75 100644
--- a/src/libs/utils/mimetypes2/mimedatabase.cpp
+++ b/src/libs/utils/mimetypes2/mimedatabase.cpp
@@ -423,7 +423,7 @@ MimeType MimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileName
 
     // Pass 1) Try to match on the file name
     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));
         if (mime.isValid())
             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
             const MimeType mime = mimeTypeForName(candidatesByName.m_matchingMimeTypes.at(0));
             if (mime.isValid())
@@ -719,7 +719,7 @@ QList<MimeType> MimeDatabase::mimeTypesForFileName(const QString &fileName) cons
 
     const QStringList matches = d->mimeTypeForFileName(fileName);
     QList<MimeType> mimes;
-    mimes.reserve(matches.count());
+    mimes.reserve(matches.size());
     for (const QString &mime : matches)
         mimes.append(d->mimeTypeForName(mime));
     return mimes;
diff --git a/src/libs/utils/mimetypes2/mimeprovider.cpp b/src/libs/utils/mimetypes2/mimeprovider.cpp
index 0ed178348be..74d9ae38c01 100644
--- a/src/libs/utils/mimetypes2/mimeprovider.cpp
+++ b/src/libs/utils/mimetypes2/mimeprovider.cpp
@@ -747,7 +747,7 @@ void MimeXMLProvider::ensureLoaded()
     const QString packageDir = m_directory + QStringLiteral("/packages");
     QDir dir(packageDir);
     const QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot);
-    allFiles.reserve(files.count());
+    allFiles.reserve(files.size());
     for (const QString &xmlFile : files)
         allFiles.append(packageDir + u'/' + xmlFile);