mime type matching optimization

given that checking for a match is expensive and determining the
priority is cheap, it makes sense to match only if the priority is known
to be high enough.

Reviewed-by: Leandro Melo

1 files changed, 3 insertions, 5 deletions

diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp
index f185529152..50c9548b8a 100644
--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/src/plugins/coreplugin/mimedatabase.cpp
@@ -724,11 +724,9 @@ unsigned MimeType::matchesData(const QByteArray &data) const
     unsigned priority = 0;
     if (!data.isEmpty()) {
         foreach (const IMagicMatcher::IMagicMatcherSharedPointer &matcher, m_d->magicMatchers) {
-            if (matcher->matches(data)) {
-                const unsigned magicPriority = matcher->priority();
-                if (magicPriority > priority)
-                    priority = magicPriority;
-            }
+            const unsigned magicPriority = matcher->priority();
+            if (magicPriority > priority && matcher->matches(data))
+                priority = magicPriority;
         }
     }
     return priority;