From 86dcac6d62b9932748396bbcbc79762c6d56ca49 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 8 Aug 2024 16:10:55 +0200 Subject: [PATCH] Update mime database from Qt qtbase/49b726fa71418c2d7efdfec91e287f4aaac9cd9b QMimeDatabasePrivate: remove duplicate else-if branch Change-Id: Idff4f0162dced6f2ceb0f7396287279f67adbd04 Reviewed-by: Jarek Kobus --- src/libs/utils/mimetypes2/mimedatabase.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libs/utils/mimetypes2/mimedatabase.cpp b/src/libs/utils/mimetypes2/mimedatabase.cpp index 9c3238acefb..1fd3cf0b5a4 100644 --- a/src/libs/utils/mimetypes2/mimedatabase.cpp +++ b/src/libs/utils/mimetypes2/mimedatabase.cpp @@ -471,13 +471,10 @@ MimeType MimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileName MimeType MimeDatabasePrivate::mimeTypeForFileExtension(const QString &fileName) { const QStringList matches = mimeTypeForFileName(fileName); - const int matchCount = matches.count(); - if (matchCount == 0) { + if (matches.isEmpty()) { return mimeTypeForName(defaultMimeType()); - } else if (matchCount == 1) { - return mimeTypeForName(matches.first()); } else { - // We have to pick one. + // We have to pick one in case of multiple matches. return mimeTypeForName(matches.first()); } }