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

Remove unneeded checks for validity of mime types

Browse Source 
mimeTypeForFile(...) is documented to never return an invalid mime type
(it will fall back to binary if everything else fails), so remove
unneeded checks.

This also removes fallback code that used text/plain in case of invalid
mime type, which is probably a relict from the old mime implementation.

Change-Id: I88ed41fa3b81704f110f9f481b0f01424a487cbb
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2018-06-21 15:11:39 +02:00
parent e00218b997
commit a8c5af56a9
8 changed files with 59 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -795,15 +795,10 @@ void MainWindow::openFile()
static IDocumentFactory *findDocumentFactory(const QList<IDocumentFactory*> &fileFactories,
const QFileInfo &fi)
{
const MimeType mt = Utils::mimeTypeForFile(fi);
if (mt.isValid()) {
const QString typeName = mt.name();
foreach (IDocumentFactory *factory, fileFactories) {
if (factory->mimeTypes().contains(typeName))
return factory;
}
}
return 0;
const QString typeName = Utils::mimeTypeForFile(fi).name();
return Utils::findOrDefault(fileFactories, [typeName](IDocumentFactory *f) {
return f->mimeTypes().contains(typeName);
});
}
/*! Either opens \a fileNames with editors or loads a project.