From 49b726fa71418c2d7efdfec91e287f4aaac9cd9b Mon Sep 17 00:00:00 2001 From: Igor Kushnir Date: Sat, 11 Dec 2021 17:47:58 +0200 Subject: [PATCH] QMimeDatabasePrivate: remove duplicate else-if branch In mimeTypeForFileExtension(), the `else if (matchCount == 1)` branch differs from the `else` branch only in a comment. Remove the branch with duplicate code, adjust the comment and simplify the `if` condition. Change-Id: Ib97a057880373ab3ab9b585e688b38fe1f542ba2 Reviewed-by: Thiago Macieira --- src/corelib/mimetypes/qmimedatabase.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp index 24ccdccd69..1788e0e9f8 100644 --- a/src/corelib/mimetypes/qmimedatabase.cpp +++ b/src/corelib/mimetypes/qmimedatabase.cpp @@ -440,13 +440,10 @@ QMimeType QMimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileNa QMimeType QMimeDatabasePrivate::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()); } }