feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Don't register mimetype for diff editor

Browse Source 
Task-number: QTCREATORBUG-11624

Change-Id: I9eeeeeb862e335c1a4d5cbd80d0908297ad6d1db
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
jkobus
2014-03-10 13:28:34 +01:00
committed by Jarek Kobus
parent 4bf11c7df6
commit b8046e603d
5 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -113,7 +113,7 @@ void DescriptionEditorWidget::setDisplaySettings(const DisplaySettings &ds)
DiffEditor::DiffEditor() DiffEditor::DiffEditor()
: IEditor(0) : IEditor(0)
, m_document(new DiffEditorDocument(QLatin1String(Constants::DIFF_EDITOR_MIMETYPE))) , m_document(new DiffEditorDocument())
, m_descriptionWidget(0) , m_descriptionWidget(0)
, m_diffWidget(0) , m_diffWidget(0)
, m_controller(0) , m_controller(0)

1
src/plugins/diffeditor/diffeditorconstants.h
View File

@@ -37,7 +37,6 @@ namespace Constants {
const char DIFF_EDITOR_ID[] = "Diff Editor"; const char DIFF_EDITOR_ID[] = "Diff Editor";
const char DIFF_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("DiffEditor", "Diff Editor"); const char DIFF_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("DiffEditor", "Diff Editor");
const char DIFF_EDITOR_MIMETYPE[] = "text/x-patch";
const char G_TOOLS_DIFF[] = "QtCreator.Group.Tools.Options"; const char G_TOOLS_DIFF[] = "QtCreator.Group.Tools.Options";
} // namespace Constants } // namespace Constants

5
src/plugins/diffeditor/diffeditordocument.cpp
View File

@@ -35,9 +35,8 @@
namespace DiffEditor { namespace DiffEditor {
DiffEditorDocument::DiffEditorDocument(const QString &mimeType) : DiffEditorDocument::DiffEditorDocument() :
Core::IDocument(), Core::IDocument(),
m_mimeType(mimeType),
m_diffEditorController(new DiffEditorController(this)) m_diffEditorController(new DiffEditorController(this))
{ {
setDisplayName(QCoreApplication::translate("DiffEditor", Constants::DIFF_EDITOR_DISPLAY_NAME)); setDisplayName(QCoreApplication::translate("DiffEditor", Constants::DIFF_EDITOR_DISPLAY_NAME));
@@ -69,7 +68,7 @@ bool DiffEditorDocument::save(QString *errorString, const QString &fileName, boo
QString DiffEditorDocument::mimeType() const QString DiffEditorDocument::mimeType() const
{ {
return m_mimeType; return QString();
} }
Core::IDocument::ReloadBehavior DiffEditorDocument::reloadBehavior(ChangeTrigger state, ChangeType type) const Core::IDocument::ReloadBehavior DiffEditorDocument::reloadBehavior(ChangeTrigger state, ChangeType type) const

3
src/plugins/diffeditor/diffeditordocument.h
View File

@@ -42,7 +42,7 @@ class DIFFEDITOR_EXPORT DiffEditorDocument : public Core::IDocument
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit DiffEditorDocument(const QString &mimeType); explicit DiffEditorDocument();
virtual ~DiffEditorDocument(); virtual ~DiffEditorDocument();
DiffEditorController *controller() const; DiffEditorController *controller() const;
@@ -59,7 +59,6 @@ public:
bool reload(QString *errorString, ReloadFlag flag, ChangeType type); bool reload(QString *errorString, ReloadFlag flag, ChangeType type);
private: private:
const QString m_mimeType;
DiffEditorController *m_diffEditorController; DiffEditorController *m_diffEditorController;
}; };

1
src/plugins/diffeditor/diffeditorfactory.cpp
View File

@@ -43,7 +43,6 @@ DiffEditorFactory::DiffEditorFactory(QObject *parent)
{ {
setId(Constants::DIFF_EDITOR_ID); setId(Constants::DIFF_EDITOR_ID);
setDisplayName(qApp->translate("DiffEditorFactory", Constants::DIFF_EDITOR_DISPLAY_NAME)); setDisplayName(qApp->translate("DiffEditorFactory", Constants::DIFF_EDITOR_DISPLAY_NAME));
addMimeType(QLatin1String(Constants::DIFF_EDITOR_MIMETYPE));
} }
Core::IEditor *DiffEditorFactory::createEditor() Core::IEditor *DiffEditorFactory::createEditor()