whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <thiago.macieira@intel.com>
bb10
Igor Kushnir 2021-12-11 19:50:03 +02:00
parent 5a47e29914
commit 6ad6df88dc
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/mimetypes/qmimedatabase.cpp
View File

@ -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<QMimeType> QMimeDatabasePrivate::allMimeTypes()