Use new mime database

Change-Id: I4305872b6b11ef3e8a364280ffa5209a5a793600
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

2 files changed, 15 insertions, 12 deletions

diff --git a/src/plugins/texteditor/generichighlighter/manager.cpp b/src/plugins/texteditor/generichighlighter/manager.cpp
index 08dc24856b..f625450999 100644
--- a/src/plugins/texteditor/generichighlighter/manager.cpp
+++ b/src/plugins/texteditor/generichighlighter/manager.cpp
@@ -43,6 +43,7 @@
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <utils/algorithm.h>
 #include <utils/QtConcurrentTools>
+#include <utils/mimetypes/mimedatabase.h>
 #include <utils/networkaccessmanager.h>
 
 #include <QCoreApplication>
@@ -150,18 +151,19 @@ static bool matchesPattern(const QString &fileName, DefinitionMetaDataPtr metaDa
     return false;
 }
 
-QString Manager::definitionIdByMimeType(const Core::MimeType &mimeType) const
+QString Manager::definitionIdByMimeType(const Utils::MimeType &mimeType) const
 {
-    QList<Core::MimeType> queue;
+    Utils::MimeDatabase mdb;
+    QList<Utils::MimeType> queue;
     queue.append(mimeType);
     while (!queue.isEmpty()) {
-        const Core::MimeType mt = queue.takeFirst();
-        const QString id = m_register.m_idByMimeType.value(mt.type());
+        const Utils::MimeType mt = queue.takeFirst();
+        const QString id = m_register.m_idByMimeType.value(mt.name());
         if (!id.isEmpty())
             return id;
-        foreach (const QString &parent, mt.subClassesOf()) {
-            const Core::MimeType parentMt = Core::MimeDatabase::findByType(parent);
-            if (!parentMt.isNull())
+        foreach (const QString &parent, mt.parentMimeTypes()) {
+            const Utils::MimeType parentMt = mdb.mimeTypeForName(parent);
+            if (parentMt.isValid())
                 queue.append(parentMt);
         }
     }
@@ -186,7 +188,8 @@ QString Manager::definitionIdByFile(const QString &filePath) const
     return bestId;
 }
 
-QString Manager::definitionIdByMimeTypeAndFile(const MimeType &mimeType, const QString &filePath) const
+QString Manager::definitionIdByMimeTypeAndFile(const Utils::MimeType &mimeType,
+                                               const QString &filePath) const
 {
     QString id = definitionIdByMimeType(mimeType);
     if (!filePath.isEmpty()) {
diff --git a/src/plugins/texteditor/generichighlighter/manager.h b/src/plugins/texteditor/generichighlighter/manager.h
index 4105f65b64..22de4bbf42 100644
--- a/src/plugins/texteditor/generichighlighter/manager.h
+++ b/src/plugins/texteditor/generichighlighter/manager.h
@@ -33,8 +33,6 @@
 
 #include "highlightdefinitionmetadata.h"
 
-#include <coreplugin/mimedatabase.h>
-
 #include <QString>
 #include <QHash>
 #include <QSet>
@@ -51,6 +49,8 @@ class QIODevice;
 template <class> class QFutureInterface;
 QT_END_NAMESPACE
 
+namespace Utils { class MimeType; }
+
 namespace TextEditor {
 namespace Internal {
 
@@ -69,9 +69,9 @@ public:
     static Manager *instance();
 
     QString definitionIdByName(const QString &name) const;
-    QString definitionIdByMimeType(const Core::MimeType &mimeType) const;
+    QString definitionIdByMimeType(const Utils::MimeType &mimeType) const;
     QString definitionIdByFile(const QString &filePath) const;
-    QString definitionIdByMimeTypeAndFile(const Core::MimeType &mimeType,
+    QString definitionIdByMimeTypeAndFile(const Utils::MimeType &mimeType,
                                           const QString &filePath) const;
     DefinitionMetaDataPtr availableDefinitionByName(const QString &name) const;