From 4accb027a6a536d0082118cf24d88824e997115b Mon Sep 17 00:00:00 2001
From: Leandro Melo <leandro.melo@nokia.com>
Date: Mon, 10 May 2010 14:09:23 +0200
Subject: [PATCH] Removed xml from the mime type list of plain text editor.
---
src/plugins/texteditor/TextEditor.mimetypes.xml | 9 ---------
src/plugins/texteditor/plaintexteditorfactory.cpp | 3 +--
src/plugins/texteditor/texteditorconstants.h | 1 -
3 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/plugins/texteditor/TextEditor.mimetypes.xml b/src/plugins/texteditor/TextEditor.mimetypes.xml
index 913b9fe0eba..13050f090ec 100644
--- a/src/plugins/texteditor/TextEditor.mimetypes.xml
+++ b/src/plugins/texteditor/TextEditor.mimetypes.xml
@@ -5,13 +5,4 @@
<sub-class-of type="application/octet-stream"/>
<glob pattern="*.txt"/>
</mime-type>
- <mime-type type="application/xml">
- <sub-class-of type="text/plain"/>
- <comment>XML document</comment>
- <glob pattern="*.xml"/>
- <glob pattern="*.xsl"/>
- <glob pattern="*.xslt"/>
- <glob pattern="*.xbl"/>
- <alias type="text/xml"/>
- </mime-type>
</mime-info>
diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp
index 5dc62f45676..3a960bc180e 100644
--- a/src/plugins/texteditor/plaintexteditorfactory.cpp
+++ b/src/plugins/texteditor/plaintexteditorfactory.cpp
@@ -45,8 +45,7 @@ PlainTextEditorFactory::PlainTextEditorFactory(QObject *parent)
m_actionHandler = new TextEditorActionHandler(
QLatin1String(TextEditor::Constants::C_TEXTEDITOR),
TextEditorActionHandler::Format);
- m_mimeTypes << QLatin1String(TextEditor::Constants::C_TEXTEDITOR_MIMETYPE_TEXT)
- << QLatin1String(TextEditor::Constants::C_TEXTEDITOR_MIMETYPE_XML);
+ m_mimeTypes << QLatin1String(TextEditor::Constants::C_TEXTEDITOR_MIMETYPE_TEXT);
}
PlainTextEditorFactory::~PlainTextEditorFactory()
diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h
index b111121c824..4a474b6bdbb 100644
--- a/src/plugins/texteditor/texteditorconstants.h
+++ b/src/plugins/texteditor/texteditorconstants.h
@@ -87,7 +87,6 @@ const char * const GOTO_NEXT_CHARACTER_WITH_SELECTION = "TextEditor.GotoNextChar
const char * const GOTO_PREVIOUS_WORD_WITH_SELECTION = "TextEditor.GotoPreviousWordWithSelection";
const char * const GOTO_NEXT_WORD_WITH_SELECTION = "TextEditor.GotoNextWordWithSelection";
const char * const C_TEXTEDITOR_MIMETYPE_TEXT = "text/plain";
-const char * const C_TEXTEDITOR_MIMETYPE_XML = "application/xml";
// Text color and style categories
--
GitLab