From 6ad6df88dc1067d7dd38e40ceae8840fc03af4cd Mon Sep 17 00:00:00 2001 From: Igor Kushnir Date: Sat, 11 Dec 2021 19:50:03 +0200 Subject: [PATCH] QMimeDatabasePrivate: remove Release-only fallback When mimeTypeForFile()'s `mode` argument equals none of MatchMode enumerators, an assertion fails or the default MIME type's name is returned if assertions are disabled. Simplify and optimize this code by assuming MatchDefault in the unsupported-mode case. Change-Id: Iada36e0c96c378aefaa3a9d4a170222f764e94b6 Reviewed-by: Thiago Macieira --- src/corelib/mimetypes/qmimedatabase.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp index 52fb96886d..5415e8e548 100644 --- a/src/corelib/mimetypes/qmimedatabase.cpp +++ b/src/corelib/mimetypes/qmimedatabase.cpp @@ -487,17 +487,16 @@ QMimeType QMimeDatabasePrivate::mimeTypeForFile(const QString &fileName, switch (mode) { case QMimeDatabase::MatchDefault: - return mimeTypeForFileNameAndData(fileName, nullptr); + break; case QMimeDatabase::MatchExtension: return mimeTypeForFileExtension(fileName); case QMimeDatabase::MatchContent: { QFile file(fileName); return mimeTypeForData(&file); } - default: - Q_ASSERT(false); } - return mimeTypeForName(defaultMimeType()); + // MatchDefault: + return mimeTypeForFileNameAndData(fileName, nullptr); } QList QMimeDatabasePrivate::allMimeTypes()