From 5a3a940ad3b3984b308b539e7f0456ce11d4d90e Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 4 Feb 2015 09:32:46 +0100 Subject: Use new mime database Change-Id: I4305872b6b11ef3e8a364280ffa5209a5a793600 Reviewed-by: Eike Ziller --- src/plugins/texteditor/generichighlighter/manager.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/texteditor/generichighlighter/manager.h') 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 - #include #include #include @@ -51,6 +49,8 @@ class QIODevice; template 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; -- cgit v1.2.3