From a03112d2f66efd2f2a22f91f7e0418ba8064cb2c Mon Sep 17 00:00:00 2001
From: jkobus <jaroslaw.kobus@digia.com>
Date: Mon, 12 Aug 2013 11:21:58 +0200
Subject: [PATCH] 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>
---
src/plugins/diffeditor/diffeditorfactory.cpp | 21 ++++---------------
src/plugins/diffeditor/diffeditorfactory.h | 6 ------
.../diffeditor/diffshoweditorfactory.cpp | 21 ++++---------------
.../diffeditor/diffshoweditorfactory.h | 6 ------
4 files changed, 8 insertions(+), 46 deletions(-)
diff --git a/src/plugins/diffeditor/diffeditorfactory.cpp b/src/plugins/diffeditor/diffeditorfactory.cpp
index 44363d69a7a..1a84d13a08d 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
diff --git a/src/plugins/diffeditor/diffeditorfactory.h b/src/plugins/diffeditor/diffeditorfactory.h
index 28d702771f9..a21af4d1fb3 100644
--- a/src/plugins/diffeditor/diffeditorfactory.h
+++ b/src/plugins/diffeditor/diffeditorfactory.h
@@ -47,13 +47,7 @@ class DiffEditorFactory : public Core::IEditorFactory
public:
explicit DiffEditorFactory(QObject *parent);
- QStringList mimeTypes() const;
Core::IEditor *createEditor(QWidget *parent);
- Core::Id id() const;
- QString displayName() const;
-
-private:
- const QStringList m_mimeTypes;
};
} // namespace Internal
diff --git a/src/plugins/diffeditor/diffshoweditorfactory.cpp b/src/plugins/diffeditor/diffshoweditorfactory.cpp
index eaabf322685..6597795b501 100644
--- a/src/plugins/diffeditor/diffshoweditorfactory.cpp
+++ b/src/plugins/diffeditor/diffshoweditorfactory.cpp
@@ -39,19 +39,11 @@ namespace DiffEditor {
namespace Internal {
DiffShowEditorFactory::DiffShowEditorFactory(QObject *parent)
- : IEditorFactory(parent),
- m_mimeTypes(QLatin1String(Constants::DIFF_EDITOR_MIMETYPE))
+ : IEditorFactory(parent)
{
-}
-
-Core::Id DiffShowEditorFactory::id() const
-{
- return Constants::DIFF_SHOW_EDITOR_ID;
-}
-
-QString DiffShowEditorFactory::displayName() const
-{
- return qApp->translate("DiffEditorFactory", Constants::DIFF_SHOW_EDITOR_DISPLAY_NAME);
+ setId(Constants::DIFF_SHOW_EDITOR_ID);
+ setDisplayName(qApp->translate("DiffEditorFactory", Constants::DIFF_SHOW_EDITOR_DISPLAY_NAME));
+ setMimeTypes(QStringList() << QLatin1String(Constants::DIFF_EDITOR_MIMETYPE));
}
Core::IEditor *DiffShowEditorFactory::createEditor(QWidget *parent)
@@ -61,10 +53,5 @@ Core::IEditor *DiffShowEditorFactory::createEditor(QWidget *parent)
return editor;
}
-QStringList DiffShowEditorFactory::mimeTypes() const
-{
- return m_mimeTypes;
-}
-
} // namespace Internal
} // namespace DiffEditor
diff --git a/src/plugins/diffeditor/diffshoweditorfactory.h b/src/plugins/diffeditor/diffshoweditorfactory.h
index 520b42ff3ea..25f5285dbe8 100644
--- a/src/plugins/diffeditor/diffshoweditorfactory.h
+++ b/src/plugins/diffeditor/diffshoweditorfactory.h
@@ -47,13 +47,7 @@ class DiffShowEditorFactory : public Core::IEditorFactory
public:
explicit DiffShowEditorFactory(QObject *parent);
- QStringList mimeTypes() const;
Core::IEditor *createEditor(QWidget *parent);
- Core::Id id() const;
- QString displayName() const;
-
-private:
- const QStringList m_mimeTypes;
};
} // namespace Internal
--
GitLab