diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2013-08-12 11:21:58 +0200 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2013-08-12 12:59:53 +0200 |
commit | a03112d2f66efd2f2a22f91f7e0418ba8064cb2c (patch) | |
tree | 65b023eaabe3540b8530b85096f16485d0ac82f2 /src/plugins/diffeditor/diffeditorfactory.cpp | |
parent | 1843d5ab67ced958e9b3507e8eac797b60b5cb7e (diff) | |
download | qt-creator-a03112d2f66efd2f2a22f91f7e0418ba8064cb2c.tar.gz |
Fix id of diff editor according to change b772001c
Task-number: QTCREATORBUG-9960
Change-Id: I233b697254e863b7c4389c0041104b82e97bd340
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorfactory.cpp')
-rw-r--r-- | src/plugins/diffeditor/diffeditorfactory.cpp | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/plugins/diffeditor/diffeditorfactory.cpp b/src/plugins/diffeditor/diffeditorfactory.cpp index 44363d69a7..1a84d13a08 100644 --- a/src/plugins/diffeditor/diffeditorfactory.cpp +++ b/src/plugins/diffeditor/diffeditorfactory.cpp @@ -39,19 +39,11 @@ namespace DiffEditor { namespace Internal { DiffEditorFactory::DiffEditorFactory(QObject *parent) - : IEditorFactory(parent), - m_mimeTypes(QLatin1String(Constants::DIFF_EDITOR_MIMETYPE)) + : IEditorFactory(parent) { -} - -Core::Id DiffEditorFactory::id() const -{ - return Constants::DIFF_EDITOR_ID; -} - -QString DiffEditorFactory::displayName() const -{ - return qApp->translate("DiffEditorFactory", Constants::DIFF_EDITOR_DISPLAY_NAME); + setId(Constants::DIFF_EDITOR_ID); + setDisplayName(qApp->translate("DiffEditorFactory", Constants::DIFF_EDITOR_DISPLAY_NAME)); + addMimeType(QLatin1String(Constants::DIFF_EDITOR_MIMETYPE)); } Core::IEditor *DiffEditorFactory::createEditor(QWidget *parent) @@ -61,10 +53,5 @@ Core::IEditor *DiffEditorFactory::createEditor(QWidget *parent) return editor; } -QStringList DiffEditorFactory::mimeTypes() const -{ - return m_mimeTypes; -} - } // namespace Internal } // namespace DiffEditor |