diff options
34 files changed, 29 insertions, 136 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp index 1e4066a577..57287e784a 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp @@ -41,6 +41,7 @@ AutotoolsProjectFile::AutotoolsProjectFile(AutotoolsProject *project, const QStr m_project(project) { setId("Autotools.ProjectFile"); + setMimeType(QLatin1String(Constants::MAKEFILE_MIMETYPE)); setFilePath(fileName); } @@ -63,11 +64,6 @@ QString AutotoolsProjectFile::suggestedFileName() const return QString(); } -QString AutotoolsProjectFile::mimeType() const -{ - return QLatin1String(Constants::MAKEFILE_MIMETYPE); -} - bool AutotoolsProjectFile::isModified() const { return false; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h index 36f9b7d168..07afe13717 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h @@ -59,7 +59,6 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave); QString defaultPath() const; QString suggestedFileName() const; - QString mimeType() const; bool isModified() const; bool isSaveAsAllowed() const; bool reload(QString *errorString, ReloadFlag flag, ChangeType type); diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index f96ce29c20..2ff5f954e3 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -206,17 +206,13 @@ public: Core::IDocument(parent) { setId(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID); + setMimeType(QLatin1String(BINEditor::Constants::C_BINEDITOR_MIMETYPE)); m_widget = parent; connect(m_widget, SIGNAL(dataRequested(quint64)), this, SLOT(provideData(quint64))); connect(m_widget, SIGNAL(newRangeRequested(quint64)), this, SLOT(provideNewRange(quint64))); } - ~BinEditorDocument() {} - - QString mimeType() const { - return QLatin1String(BINEditor::Constants::C_BINEDITOR_MIMETYPE); - } bool setContents(const QByteArray &contents) { diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index ef775db962..e1d76c7968 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -767,6 +767,7 @@ CMakeFile::CMakeFile(CMakeProject *parent, QString fileName) : Core::IDocument(parent), m_project(parent) { setId("Cmake.ProjectFile"); + setMimeType(QLatin1String(Constants::CMAKEMIMETYPE)); setFilePath(fileName); } @@ -790,12 +791,6 @@ QString CMakeFile::suggestedFileName() const return QString(); } -QString CMakeFile::mimeType() const -{ - return QLatin1String(Constants::CMAKEMIMETYPE); -} - - bool CMakeFile::isModified() const { return false; diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h index 1ba92dd82b..cd0edf866f 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.h +++ b/src/plugins/cmakeprojectmanager/cmakeproject.h @@ -194,7 +194,6 @@ public: QString defaultPath() const; QString suggestedFileName() const; - QString mimeType() const; bool isModified() const; bool isSaveAsAllowed() const; diff --git a/src/plugins/coreplugin/idocument.cpp b/src/plugins/coreplugin/idocument.cpp index 6bd6d77b1f..963f51c150 100644 --- a/src/plugins/coreplugin/idocument.cpp +++ b/src/plugins/coreplugin/idocument.cpp @@ -142,6 +142,14 @@ void IDocument::setTemporary(bool temporary) m_temporary = temporary; } +void IDocument::setMimeType(const QString &mimeType) +{ + if (m_mimeType != mimeType) { + m_mimeType = mimeType; + emit mimeTypeChanged(); + } +} + bool IDocument::autoSave(QString *errorString, const QString &fileName) { if (!save(errorString, fileName, true)) diff --git a/src/plugins/coreplugin/idocument.h b/src/plugins/coreplugin/idocument.h index d64502bd5a..83945cd740 100644 --- a/src/plugins/coreplugin/idocument.h +++ b/src/plugins/coreplugin/idocument.h @@ -94,7 +94,9 @@ public: virtual QString defaultPath() const = 0; virtual QString suggestedFileName() const = 0; - virtual QString mimeType() const = 0; + + QString mimeType() const { return m_mimeType; } + void setMimeType(const QString &mimeType); virtual bool shouldAutoSave() const; virtual bool isModified() const = 0; @@ -116,6 +118,7 @@ public: signals: void changed(); + void mimeTypeChanged(); void aboutToReload(); void reloadFinished(bool success); @@ -124,6 +127,7 @@ signals: private: Id m_id; + QString m_mimeType; QString m_filePath; QString m_displayName; bool m_temporary; diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp index bb301da91f..9915cbe32f 100644 --- a/src/plugins/designer/formwindowfile.cpp +++ b/src/plugins/designer/formwindowfile.cpp @@ -52,11 +52,11 @@ namespace Designer { namespace Internal { FormWindowFile::FormWindowFile(QDesignerFormWindowInterface *form, QObject *parent) - : m_mimeType(QLatin1String(Designer::Constants::FORM_MIMETYPE)), - m_shouldAutoSave(false), + : m_shouldAutoSave(false), m_formWindow(form), m_isModified(false) { + setMimeType(QLatin1String(Designer::Constants::FORM_MIMETYPE)); setParent(parent); setId(Core::Id(Designer::Constants::K_DESIGNER_XML_EDITOR_ID)); // Designer needs UTF-8 regardless of settings. @@ -210,11 +210,6 @@ QString FormWindowFile::suggestedFileName() const return m_suggestedName; } -QString FormWindowFile::mimeType() const -{ - return m_mimeType; -} - bool FormWindowFile::writeFile(const QString &fn, QString *errorString) const { if (Designer::Constants::Internal::debug) diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h index c1ba023607..939a0756e5 100644 --- a/src/plugins/designer/formwindowfile.h +++ b/src/plugins/designer/formwindowfile.h @@ -59,7 +59,6 @@ public: bool reload(QString *errorString, ReloadFlag flag, ChangeType type); QString defaultPath() const; QString suggestedFileName() const; - QString mimeType() const; // Internal void setSuggestedFileName(const QString &fileName); @@ -83,8 +82,6 @@ private slots: void slotFormWindowRemoved(QDesignerFormWindowInterface *w); private: - const QString m_mimeType; - QString m_suggestedName; bool m_shouldAutoSave; // Might actually go out of scope before the IEditor due diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp index 1bd386034e..a13e23f2e5 100644 --- a/src/plugins/diffeditor/diffeditordocument.cpp +++ b/src/plugins/diffeditor/diffeditordocument.cpp @@ -67,11 +67,6 @@ bool DiffEditorDocument::save(QString *errorString, const QString &fileName, boo return false; } -QString DiffEditorDocument::mimeType() const -{ - return QString(); -} - Core::IDocument::ReloadBehavior DiffEditorDocument::reloadBehavior(ChangeTrigger state, ChangeType type) const { Q_UNUSED(state) diff --git a/src/plugins/diffeditor/diffeditordocument.h b/src/plugins/diffeditor/diffeditordocument.h index ffed43ce5d..8626356288 100644 --- a/src/plugins/diffeditor/diffeditordocument.h +++ b/src/plugins/diffeditor/diffeditordocument.h @@ -52,7 +52,6 @@ public: QString suggestedFileName() const { return QString(); } bool isModified() const { return false; } - QString mimeType() const; bool isSaveAsAllowed() const { return false; } bool save(QString *errorString, const QString &fileName, bool autoSave); ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const; diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 3272ae7a03..3b0f469ba3 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -409,6 +409,7 @@ GenericProjectFile::GenericProjectFile(GenericProject *parent, QString fileName, m_options(options) { setId("Generic.ProjectFile"); + setMimeType(QLatin1String(Constants::GENERICMIMETYPE)); setFilePath(fileName); } @@ -427,11 +428,6 @@ QString GenericProjectFile::suggestedFileName() const return QString(); } -QString GenericProjectFile::mimeType() const -{ - return QLatin1String(Constants::GENERICMIMETYPE); -} - bool GenericProjectFile::isModified() const { return false; diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h index 30a657ff25..297e41df15 100644 --- a/src/plugins/genericprojectmanager/genericproject.h +++ b/src/plugins/genericprojectmanager/genericproject.h @@ -123,7 +123,6 @@ public: QString defaultPath() const; QString suggestedFileName() const; - QString mimeType() const; bool isModified() const; bool isSaveAsAllowed() const; diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp index a5c06e0f08..df52d2c46a 100644 --- a/src/plugins/imageviewer/imageviewerfile.cpp +++ b/src/plugins/imageviewer/imageviewerfile.cpp @@ -42,6 +42,7 @@ ImageViewerFile::ImageViewerFile(ImageViewer *parent) { setId(Constants::IMAGEVIEWER_ID); m_editor = parent; + connect(this, SIGNAL(mimeTypeChanged()), this, SIGNAL(changed())); } Core::IDocument::ReloadBehavior ImageViewerFile::reloadBehavior(ChangeTrigger state, ChangeType type) const @@ -90,11 +91,6 @@ QString ImageViewerFile::suggestedFileName() const return QString(); } -QString ImageViewerFile::mimeType() const -{ - return m_mimeType; -} - bool ImageViewerFile::isModified() const { return false; @@ -105,11 +101,5 @@ bool ImageViewerFile::isSaveAsAllowed() const return false; } -void ImageViewerFile::setMimetype(const QString &mimetype) -{ - m_mimeType = mimetype; - emit changed(); -} - } // namespace Internal } // namespace ImageViewer diff --git a/src/plugins/imageviewer/imageviewerfile.h b/src/plugins/imageviewer/imageviewerfile.h index dc88a47c04..135454df8c 100644 --- a/src/plugins/imageviewer/imageviewerfile.h +++ b/src/plugins/imageviewer/imageviewerfile.h @@ -50,7 +50,6 @@ public: QString defaultPath() const; QString suggestedFileName() const; - QString mimeType() const; bool isModified() const; bool isSaveAsAllowed() const; @@ -58,10 +57,7 @@ public: ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const; bool reload(QString *errorString, ReloadFlag flag, ChangeType type); - void setMimetype(const QString &mimetype); - private: - QString m_mimeType; ImageViewer *m_editor; }; diff --git a/src/plugins/qbsprojectmanager/qbsprojectfile.cpp b/src/plugins/qbsprojectmanager/qbsprojectfile.cpp index 88a1ce496b..5502462e7f 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectfile.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectfile.cpp @@ -39,6 +39,7 @@ QbsProjectFile::QbsProjectFile(QbsProject *parent, QString fileName) : Core::IDo m_project(parent) { setId("Qbs.ProjectFile"); + setMimeType(QLatin1String(Constants::MIME_TYPE)); setFilePath(fileName); } @@ -65,11 +66,6 @@ QString QbsProjectFile::suggestedFileName() const return QString(); } -QString QbsProjectFile::mimeType() const -{ - return QLatin1String(Constants::MIME_TYPE); -} - bool QbsProjectFile::isModified() const { return false; diff --git a/src/plugins/qbsprojectmanager/qbsprojectfile.h b/src/plugins/qbsprojectmanager/qbsprojectfile.h index 43ab6d5831..c33a1085be 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectfile.h +++ b/src/plugins/qbsprojectmanager/qbsprojectfile.h @@ -50,7 +50,6 @@ public: QString defaultPath() const; QString suggestedFileName() const; - QString mimeType() const; bool isModified() const; bool isSaveAsAllowed() const; diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 63ba7c77f9..50505a4c66 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -184,6 +184,7 @@ QmakePriFile::QmakePriFile(QmakeProjectManager::QmakePriFileNode *qmakePriFile) : IDocument(qmakePriFile), m_priFile(qmakePriFile) { setId("Qmake.PriFile"); + setMimeType(QLatin1String(QmakeProjectManager::Constants::PROFILE_MIMETYPE)); setFilePath(m_priFile->path()); } @@ -205,11 +206,6 @@ QString QmakePriFile::suggestedFileName() const return QString(); } -QString QmakePriFile::mimeType() const -{ - return QLatin1String(QmakeProjectManager::Constants::PROFILE_MIMETYPE); -} - bool QmakePriFile::isModified() const { return false; diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h index 3750558cc6..ff311b66df 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.h +++ b/src/plugins/qmakeprojectmanager/qmakenodes.h @@ -242,7 +242,6 @@ public: virtual QString defaultPath() const; virtual QString suggestedFileName() const; - virtual QString mimeType() const; virtual bool isModified() const; virtual bool isSaveAsAllowed() const; diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 857d04b593..4b8e2d4302 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -128,16 +128,12 @@ public: QString defaultPath() const; QString suggestedFileName() const; - virtual QString mimeType() const; bool isModified() const; bool isSaveAsAllowed() const; ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const; bool reload(QString *errorString, ReloadFlag flag, ChangeType type); - -private: - const QString m_mimeType; }; /// Watches folders for QmakePriFile nodes @@ -274,10 +270,10 @@ void ProjectFilesVisitor::visitFolderNode(FolderNode *folderNode) // ----------- QmakeProjectFile namespace Internal { QmakeProjectFile::QmakeProjectFile(const QString &filePath, QObject *parent) - : Core::IDocument(parent), - m_mimeType(QLatin1String(QmakeProjectManager::Constants::PROFILE_MIMETYPE)) + : Core::IDocument(parent) { setId("Qmake.ProFile"); + setMimeType(QLatin1String(QmakeProjectManager::Constants::PROFILE_MIMETYPE)); setFilePath(filePath); } @@ -297,11 +293,6 @@ QString QmakeProjectFile::suggestedFileName() const return QString(); } -QString QmakeProjectFile::mimeType() const -{ - return m_mimeType; -} - bool QmakeProjectFile::isModified() const { return false; // we save after changing anyway diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp index ad7801211a..9dfa3c68e9 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp @@ -42,6 +42,7 @@ QmlProjectFile::QmlProjectFile(QmlProject *parent, QString fileName) QTC_CHECK(m_project); QTC_CHECK(!fileName.isEmpty()); setId("Qml.ProjectFile"); + setMimeType(QLatin1String(Constants::QMLPROJECT_MIMETYPE)); setFilePath(fileName); } @@ -64,11 +65,6 @@ QString QmlProjectFile::suggestedFileName() const return QString(); } -QString QmlProjectFile::mimeType() const -{ - return QLatin1String(Constants::QMLPROJECT_MIMETYPE); -} - bool QmlProjectFile::isModified() const { return false; diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.h b/src/plugins/qmlprojectmanager/qmlprojectfile.h index 24fdd0797c..f8275baeb7 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectfile.h +++ b/src/plugins/qmlprojectmanager/qmlprojectfile.h @@ -50,7 +50,6 @@ public: virtual QString defaultPath() const; virtual QString suggestedFileName() const; - virtual QString mimeType() const; virtual bool isModified() const; virtual bool isSaveAsAllowed() const; diff --git a/src/plugins/qnx/bardescriptordocument.cpp b/src/plugins/qnx/bardescriptordocument.cpp index 4ac85d3d46..76dd08f2db 100644 --- a/src/plugins/qnx/bardescriptordocument.cpp +++ b/src/plugins/qnx/bardescriptordocument.cpp @@ -49,6 +49,7 @@ BarDescriptorDocument::BarDescriptorDocument(QObject *parent) : Core::TextDocument(parent) { setId(Constants::QNX_BAR_DESCRIPTOR_EDITOR_ID); + setMimeType(QLatin1String(Constants::QNX_BAR_DESCRIPTOR_MIME_TYPE)); // blackberry-nativepackager requires the XML file to be in UTF-8 encoding, // force if possible if (QTextCodec *defaultUTF8 = QTextCodec::codecForName("UTF-8")) @@ -102,11 +103,6 @@ QString BarDescriptorDocument::suggestedFileName() const return fi.fileName(); } -QString BarDescriptorDocument::mimeType() const -{ - return QLatin1String(Constants::QNX_BAR_DESCRIPTOR_MIME_TYPE); -} - bool BarDescriptorDocument::shouldAutoSave() const { return false; diff --git a/src/plugins/qnx/bardescriptordocument.h b/src/plugins/qnx/bardescriptordocument.h index 87a745bdda..2fea2d2169 100644 --- a/src/plugins/qnx/bardescriptordocument.h +++ b/src/plugins/qnx/bardescriptordocument.h @@ -91,7 +91,6 @@ public: QString defaultPath() const; QString suggestedFileName() const; - QString mimeType() const; bool shouldAutoSave() const; bool isModified() const; diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index 53ec554652..004c7d8a85 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -62,22 +62,16 @@ enum { debugResourceEditorW = 0 }; ResourceEditorDocument::ResourceEditorDocument(ResourceEditorW *parent) : IDocument(parent), - m_mimeType(QLatin1String(ResourceEditor::Constants::C_RESOURCE_MIMETYPE)), m_blockDirtyChanged(false), m_parent(parent) { setId(ResourceEditor::Constants::RESOURCEEDITOR_ID); + setMimeType(QLatin1String(ResourceEditor::Constants::C_RESOURCE_MIMETYPE)); setFilePath(parent->m_resourceEditor->fileName()); if (debugResourceEditorW) qDebug() << "ResourceEditorFile::ResourceEditorFile()"; } -QString ResourceEditorDocument::mimeType() const -{ - return m_mimeType; -} - - ResourceEditorW::ResourceEditorW(const Core::Context &context, ResourceEditorPlugin *plugin, QWidget *parent) diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h index 870e00c5a0..8cb22de247 100644 --- a/src/plugins/resourceeditor/resourceeditorw.h +++ b/src/plugins/resourceeditor/resourceeditorw.h @@ -62,7 +62,6 @@ public: bool reload(QString *errorString, ReloadFlag flag, ChangeType type); QString defaultPath() const; QString suggestedFileName() const; - QString mimeType() const; void setFilePath(const QString &newName); void setBlockDirtyChanged(bool value); @@ -70,7 +69,6 @@ public slots: void dirtyChanged(bool); private: - const QString m_mimeType; bool m_blockDirtyChanged; ResourceEditorW *m_parent; }; diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index e27915a665..552a628132 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -441,6 +441,7 @@ ResourceFileWatcher::ResourceFileWatcher(ResourceTopLevelNode *node) : IDocument(node), m_node(node) { setId("ResourceNodeWatcher"); + setMimeType(QLatin1String(ResourceEditor::Constants::C_RESOURCE_MIMETYPE)); setFilePath(node->path()); } @@ -462,11 +463,6 @@ QString ResourceFileWatcher::suggestedFileName() const return QString(); } -QString ResourceFileWatcher::mimeType() const -{ - return QLatin1String(ResourceEditor::Constants::C_RESOURCE_MIMETYPE); -} - bool ResourceFileWatcher::isModified() const { return false; diff --git a/src/plugins/resourceeditor/resourcenode.h b/src/plugins/resourceeditor/resourcenode.h index 867dfce7d9..f2fa331076 100644 --- a/src/plugins/resourceeditor/resourcenode.h +++ b/src/plugins/resourceeditor/resourcenode.h @@ -122,7 +122,6 @@ public: virtual QString defaultPath() const; virtual QString suggestedFileName() const; - virtual QString mimeType() const; virtual bool isModified() const; virtual bool isSaveAsAllowed() const; diff --git a/src/plugins/tasklist/taskfile.cpp b/src/plugins/tasklist/taskfile.cpp index 6ea6ddf9aa..fa695c5e2a 100644 --- a/src/plugins/tasklist/taskfile.cpp +++ b/src/plugins/tasklist/taskfile.cpp @@ -64,11 +64,6 @@ QString TaskFile::suggestedFileName() const return QString(); } -QString TaskFile::mimeType() const -{ - return QString(); -} - bool TaskFile::isModified() const { return false; diff --git a/src/plugins/tasklist/taskfile.h b/src/plugins/tasklist/taskfile.h index 60f012dca6..10018c35f8 100644 --- a/src/plugins/tasklist/taskfile.h +++ b/src/plugins/tasklist/taskfile.h @@ -47,7 +47,6 @@ public: QString defaultPath() const; QString suggestedFileName() const; - QString mimeType() const; bool isModified() const; bool isSaveAsAllowed() const; diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp index 0a4108dabb..cfb9964ce2 100644 --- a/src/plugins/texteditor/basetextdocument.cpp +++ b/src/plugins/texteditor/basetextdocument.cpp @@ -80,7 +80,6 @@ public slots: public: QString m_defaultPath; QString m_suggestedFileName; - QString m_mimeType; TypingSettings m_typingSettings; StorageSettings m_storageSettings; TabSettings m_tabSettings; @@ -231,19 +230,6 @@ QChar BaseTextDocument::characterAt(int pos) const return document()->characterAt(pos); } -QString BaseTextDocument::mimeType() const -{ - return d->m_mimeType; -} - -void BaseTextDocument::setMimeType(const QString &mt) -{ - if (d->m_mimeType != mt) { - d->m_mimeType = mt; - emit mimeTypeChanged(); - } -} - void BaseTextDocument::setTypingSettings(const TypingSettings &typingSettings) { d->m_typingSettings = typingSettings; diff --git a/src/plugins/texteditor/basetextdocument.h b/src/plugins/texteditor/basetextdocument.h index ac280b9dd1..09d8fa1882 100644 --- a/src/plugins/texteditor/basetextdocument.h +++ b/src/plugins/texteditor/basetextdocument.h @@ -92,8 +92,6 @@ public: bool isSaveAsAllowed() const; void checkPermissions(); bool reload(QString *errorString, ReloadFlag flag, ChangeType type); - QString mimeType() const; - void setMimeType(const QString &mt); void setFilePath(const QString &newName); QString defaultPath() const; diff --git a/src/plugins/vcsbase/submiteditorfile.cpp b/src/plugins/vcsbase/submiteditorfile.cpp index 4101023ba2..4fc185e02b 100644 --- a/src/plugins/vcsbase/submiteditorfile.cpp +++ b/src/plugins/vcsbase/submiteditorfile.cpp @@ -47,11 +47,11 @@ using namespace VcsBase::Internal; SubmitEditorFile::SubmitEditorFile(const VcsBaseSubmitEditorParameters *parameters, VcsBaseSubmitEditor *parent) : Core::IDocument(parent), - m_mimeType(QLatin1String(parameters->mimeType)), m_modified(false), m_editor(parent) { setId(parameters->id); + setMimeType(QLatin1String(parameters->mimeType)); setTemporary(true); } @@ -86,11 +86,6 @@ bool SubmitEditorFile::save(QString *errorString, const QString &fileName, bool return true; } -QString SubmitEditorFile::mimeType() const -{ - return m_mimeType; -} - Core::IDocument::ReloadBehavior SubmitEditorFile::reloadBehavior(ChangeTrigger state, ChangeType type) const { Q_UNUSED(state) diff --git a/src/plugins/vcsbase/submiteditorfile.h b/src/plugins/vcsbase/submiteditorfile.h index 11801030d2..7fd2f4e3d8 100644 --- a/src/plugins/vcsbase/submiteditorfile.h +++ b/src/plugins/vcsbase/submiteditorfile.h @@ -51,7 +51,6 @@ public: QString suggestedFileName() const { return QString(); } bool isModified() const { return m_modified; } - QString mimeType() const; bool isSaveAsAllowed() const { return false; } bool save(QString *errorString, const QString &fileName, bool autoSave); ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const; @@ -60,7 +59,6 @@ public: void setModified(bool modified = true); private: - const QString m_mimeType; bool m_modified; VcsBaseSubmitEditor *m_editor; }; |