feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

MIMEdatabase: Fix coding style issues

Browse Source 
Change-Id: I6ae0f8aa965cd5152bc9bc386c10be07212ae267
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Tobias Hunger
2012-10-21 23:49:17 +02:00
parent 4a91102306
commit f6d99b34d3
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/mimedatabase.cpp
View File

@@ -1495,8 +1495,8 @@ MimeType MimeDatabasePrivate::findByFile(const QFileInfo &f, unsigned *priorityP
// Pass 1) Try to match on suffix // Pass 1) Try to match on suffix
const TypeMimeTypeMap::const_iterator cend = m_typeMimeTypeMap.constEnd(); const TypeMimeTypeMap::const_iterator cend = m_typeMimeTypeMap.constEnd();
for (int level = m_maxLevel; level >= 0 && candidate.isNull(); level--) for (int level = m_maxLevel; level >= 0 && candidate.isNull(); level--) {
for (TypeMimeTypeMap::const_iterator it = m_typeMimeTypeMap.constBegin(); it != cend; ++it) for (TypeMimeTypeMap::const_iterator it = m_typeMimeTypeMap.constBegin(); it != cend; ++it) {
if (it.value().level == level) { if (it.value().level == level) {
const unsigned suffixPriority = it.value().type.matchesFileBySuffix(context); const unsigned suffixPriority = it.value().type.matchesFileBySuffix(context);
if (suffixPriority && suffixPriority > *priorityPtr) { if (suffixPriority && suffixPriority > *priorityPtr) {
@@ -1506,12 +1506,14 @@ MimeType MimeDatabasePrivate::findByFile(const QFileInfo &f, unsigned *priorityP
return candidate; return candidate;
} }
} }
}
}
// Pass 2) Match on content // Pass 2) Match on content
if (!f.isReadable()) if (!f.isReadable())
return candidate; return candidate;
for (int level = m_maxLevel; level >= 0; level--) for (int level = m_maxLevel; level >= 0; level--) {
for (TypeMimeTypeMap::const_iterator it = m_typeMimeTypeMap.constBegin(); it != cend; ++it) for (TypeMimeTypeMap::const_iterator it = m_typeMimeTypeMap.constBegin(); it != cend; ++it) {
if (it.value().level == level) { if (it.value().level == level) {
const unsigned contentPriority = it.value().type.matchesFileByContent(context); const unsigned contentPriority = it.value().type.matchesFileByContent(context);
if (contentPriority && contentPriority > *priorityPtr) { if (contentPriority && contentPriority > *priorityPtr) {
@@ -1519,6 +1521,8 @@ MimeType MimeDatabasePrivate::findByFile(const QFileInfo &f, unsigned *priorityP
candidate = it.value().type; candidate = it.value().type;
} }
} }
}
}
return candidate; return candidate;
} }