1 files changed, 7 insertions, 15 deletions
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index 6c4f036e86..f303c22e70 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -77,16 +77,12 @@ class DescriptionEditorWidget : public TextEditorWidget
     Q_OBJECT
 public:
     DescriptionEditorWidget(QWidget *parent = nullptr);
-    ~DescriptionEditorWidget() override;
 
     QSize sizeHint() const override;
 
 protected:
     void setDisplaySettings(const DisplaySettings &ds) override;
     void setMarginSettings(const MarginSettings &ms) override;
-
-private:
-    Core::IContext *m_context;
 };
 
 DescriptionEditorWidget::DescriptionEditorWidget(QWidget *parent)
@@ -107,19 +103,14 @@ DescriptionEditorWidget::DescriptionEditorWidget(QWidget *parent)
 
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 
-    m_context = new Core::IContext(this);
-    m_context->setWidget(this);
-    m_context->setContext(Core::Context(Constants::C_DIFF_EDITOR_DESCRIPTION));
-    Core::ICore::addContextObject(m_context);
+    auto context = new Core::IContext(this);
+    context->setWidget(this);
+    context->setContext(Core::Context(Constants::C_DIFF_EDITOR_DESCRIPTION));
+    Core::ICore::addContextObject(context);
 
     textDocument()->setSyntaxHighlighter(new SyntaxHighlighter);
 }
 
-DescriptionEditorWidget::~DescriptionEditorWidget()
-{
-    Core::ICore::removeContextObject(m_context);
-}
-
 QSize DescriptionEditorWidget::sizeHint() const
 {
     QSize size = TextEditorWidget::sizeHint();
@@ -254,6 +245,7 @@ DiffEditor::~DiffEditor()
 {
     delete m_toolBar;
     delete m_widget;
+    qDeleteAll(m_views);
 }
 
 Core::IEditor *DiffEditor::duplicate()
@@ -265,7 +257,7 @@ Core::IEditor *DiffEditor::duplicate()
     editor->m_sync = m_sync;
     editor->m_showDescription = m_showDescription;
 
-    Core::Id id = currentView()->id();
+    Utils::Id id = currentView()->id();
     IDiffView *view = Utils::findOr(editor->m_views, editor->m_views.at(0),
                                     Utils::equal(&IDiffView::id, id));
     QTC_ASSERT(view, view = editor->currentView());
@@ -531,7 +523,7 @@ IDiffView *DiffEditor::loadSettings()
     m_sync = s->value(horizontalScrollBarSynchronizationKeyC, true).toBool();
     m_document->setIgnoreWhitespace(s->value(ignoreWhitespaceKeyC, false).toBool());
     m_document->setContextLineCount(s->value(contextLineCountKeyC, 3).toInt());
-    Core::Id id = Core::Id::fromSetting(s->value(diffViewKeyC));
+    Utils::Id id = Utils::Id::fromSetting(s->value(diffViewKeyC));
     s->endGroup();
 
     IDiffView *view = Utils::findOr(m_views, m_views.at(0),