diff options
author | Eike Ziller <eike.ziller@digia.com> | 2014-01-08 14:03:40 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2014-01-09 14:45:14 +0100 |
commit | 4ae7d5cd1bf799773c37c80639dda151f184c0dd (patch) | |
tree | 64e07216fb2ee64f2e26a1b67ee03ba45f564ddb | |
parent | c72546fb4e6c557236f16cb0dc1673049da7e9ae (diff) | |
download | qt-creator-4ae7d5cd1bf799773c37c80639dda151f184c0dd.tar.gz |
Manifest, pro file and CMake editor can have fixed mime type set
Can be set directly from the document constructor, no need to do that
later.
Change-Id: I4326757e1b1cb1e48c157c4b330ccb2abb8f3b1f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
4 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/android/androidmanifestdocument.cpp b/src/plugins/android/androidmanifestdocument.cpp index b1f1552a8d..fd1d484ecf 100644 --- a/src/plugins/android/androidmanifestdocument.cpp +++ b/src/plugins/android/androidmanifestdocument.cpp @@ -44,6 +44,7 @@ AndroidManifestDocument::AndroidManifestDocument(AndroidManifestEditorWidget *ed : TextEditor::BaseTextDocument(), m_editorWidget(editorWidget) { + setMimeType(QLatin1String(Constants::ANDROID_MANIFEST_MIME_TYPE)); } bool AndroidManifestDocument::save(QString *errorString, const QString &fileName, bool autoSave) diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index 07e9e6223f..125fa5c50a 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/src/plugins/android/androidmanifesteditorwidget.cpp @@ -102,9 +102,7 @@ AndroidManifestEditorWidget::AndroidManifestEditorWidget(QWidget *parent) m_setAppName(false), m_appNameInStringsXml(false) { - QSharedPointer<AndroidManifestDocument> doc(new AndroidManifestDocument(this)); - doc->setMimeType(QLatin1String(Constants::ANDROID_MANIFEST_MIME_TYPE)); - setBaseTextDocument(doc); + setBaseTextDocument(QSharedPointer<AndroidManifestDocument>(new AndroidManifestDocument(this))); configure(QLatin1String(Constants::ANDROID_MANIFEST_MIME_TYPE)); diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp index 800aaf7492..06e9f3c135 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp @@ -118,9 +118,7 @@ void CMakeEditor::build() CMakeEditorWidget::CMakeEditorWidget(QWidget *parent) : BaseTextEditorWidget(parent) { - QSharedPointer<CMakeDocument> doc(new CMakeDocument); - doc->setMimeType(QLatin1String(CMakeProjectManager::Constants::CMAKEMIMETYPE)); - setBaseTextDocument(doc); + setBaseTextDocument(QSharedPointer<CMakeDocument>(new CMakeDocument)); baseTextDocument()->setSyntaxHighlighter(new CMakeHighlighter); @@ -227,6 +225,7 @@ CMakeEditorWidget::Link CMakeEditorWidget::findLinkAt(const QTextCursor &cursor, CMakeDocument::CMakeDocument() : TextEditor::BaseTextDocument() { + setMimeType(QLatin1String(CMakeProjectManager::Constants::CMAKEMIMETYPE)); } QString CMakeDocument::defaultPath() const diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp index 2e95155067..81237fd825 100644 --- a/src/plugins/qmakeprojectmanager/profileeditor.cpp +++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp @@ -86,7 +86,6 @@ ProFileEditorWidget::ProFileEditorWidget(ProFileEditorFactory *factory, QWidget : BaseTextEditorWidget(parent), m_factory(factory) { QSharedPointer<ProFileDocument> doc(new ProFileDocument()); - doc->setMimeType(QLatin1String(Constants::PROFILE_MIMETYPE)); setBaseTextDocument(doc); baseTextDocument()->setSyntaxHighlighter(new ProFileHighlighter); @@ -204,6 +203,7 @@ void ProFileEditorWidget::contextMenuEvent(QContextMenuEvent *e) ProFileDocument::ProFileDocument() : TextEditor::BaseTextDocument() { + setMimeType(QLatin1String(Constants::PROFILE_MIMETYPE)); } QString ProFileDocument::defaultPath() const |