diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-04 09:32:46 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-17 13:00:07 +0000 |
| commit | 5a3a940ad3b3984b308b539e7f0456ce11d4d90e (patch) | |
| tree | 539ac730a9291e9630c5772d78e5de1d9d4ece1e /src/plugins/coreplugin/documentmanager.cpp | |
| parent | 365c1ddb903ebb8f183195244669499a300431d2 (diff) | |
| download | qt-creator-5a3a940ad3b3984b308b539e7f0456ce11d4d90e.tar.gz | |
Use new mime database
Change-Id: I4305872b6b11ef3e8a364280ffa5209a5a793600
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/coreplugin/documentmanager.cpp')
| -rw-r--r-- | src/plugins/coreplugin/documentmanager.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index 7a31b5bba5..165b44b04f 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -32,7 +32,6 @@ #include "icore.h" #include "idocument.h" -#include "mimedatabase.h" #include "coreconstants.h" #include <coreplugin/dialogs/readonlyfilesdialog.h> @@ -46,6 +45,7 @@ #include <utils/fileutils.h> #include <utils/hostosinfo.h> +#include <utils/mimetypes/mimedatabase.h> #include <utils/qtcassert.h> #include <utils/pathchooser.h> #include <utils/reloadpromptutils.h> @@ -740,7 +740,9 @@ QString DocumentManager::getSaveAsFileName(const IDocument *document, const QStr QString filterString; if (filter.isEmpty()) { - if (const MimeType &mt = MimeDatabase::findByFile(fi)) + Utils::MimeDatabase mdb; + const Utils::MimeType &mt = mdb.mimeTypeForFile(fi); + if (mt.isValid()) filterString = mt.filterString(); selectedFilter = &filterString; } else { @@ -1391,7 +1393,9 @@ void DocumentManager::populateOpenWithMenu(QMenu *menu, const QString &fileName) bool anyMatches = false; - if (const MimeType mt = MimeDatabase::findByFile(QFileInfo(fileName))) { + Utils::MimeDatabase mdb; + const Utils::MimeType mt = mdb.mimeTypeForFile(fileName); + if (mt.isValid()) { const EditorFactoryList factories = EditorManager::editorFactories(mt, false); const ExternalEditorList externalEditors = EditorManager::externalEditors(mt, false); anyMatches = !factories.empty() || !externalEditors.empty(); |