From 250d8abe2d49d41521ba28130c08179da8a4514d Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Fri, 30 Jan 2015 11:18:08 +0100
Subject: [PATCH] DiffEditor: Remove a bit of fluff

Change-Id: Ie1b2df8eb336078ced59d1406020ae57d2b53682
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
---
 src/plugins/diffeditor/diffeditor.cpp                 | 3 +--
 src/plugins/diffeditor/diffeditordocument.cpp         | 4 ----
 src/plugins/diffeditor/diffeditordocument.h           | 5 ++---
 src/plugins/diffeditor/diffeditorguicontroller.cpp    | 3 +++
 src/plugins/diffeditor/diffeditorguicontroller.h      | 2 +-
 src/plugins/diffeditor/sidebysidediffeditorwidget.cpp | 6 ------
 src/plugins/diffeditor/sidebysidediffeditorwidget.h   | 3 +--
 7 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index 7132c913642..162d7d5acb4 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -263,8 +263,7 @@ DiffEditor::DiffEditor(const QSharedPointer<DiffEditorDocument> &doc)
 DiffEditor::~DiffEditor()
 {
     delete m_toolBar;
-    if (m_widget)
-        delete m_widget;
+    delete m_widget;
 }
 
 Core::IEditor *DiffEditor::duplicate()
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp
index 0f10016e1e4..8cf22a742bf 100644
--- a/src/plugins/diffeditor/diffeditordocument.cpp
+++ b/src/plugins/diffeditor/diffeditordocument.cpp
@@ -53,10 +53,6 @@ DiffEditorDocument::DiffEditorDocument() :
     setTemporary(true);
 }
 
-DiffEditorDocument::~DiffEditorDocument()
-{
-}
-
 DiffEditorController *DiffEditorDocument::controller() const
 {
     return m_controller;
diff --git a/src/plugins/diffeditor/diffeditordocument.h b/src/plugins/diffeditor/diffeditordocument.h
index e52d739d57d..f8a390ce02b 100644
--- a/src/plugins/diffeditor/diffeditordocument.h
+++ b/src/plugins/diffeditor/diffeditordocument.h
@@ -44,8 +44,7 @@ class DIFFEDITOR_EXPORT DiffEditorDocument : public Core::BaseTextDocument
     Q_OBJECT
     Q_PROPERTY(QString plainText READ plainText STORED false) // For access by code pasters
 public:
-    explicit DiffEditorDocument();
-    virtual ~DiffEditorDocument();
+    DiffEditorDocument();
 
     DiffEditorController *controller() const;
 
@@ -62,7 +61,7 @@ public:
     QString plainText() const;
 
 private:
-    DiffEditorController *m_controller;
+    DiffEditorController *const m_controller;
 };
 
 } // namespace DiffEditor
diff --git a/src/plugins/diffeditor/diffeditorguicontroller.cpp b/src/plugins/diffeditor/diffeditorguicontroller.cpp
index 362252fd9cd..d79ed166be9 100644
--- a/src/plugins/diffeditor/diffeditorguicontroller.cpp
+++ b/src/plugins/diffeditor/diffeditorguicontroller.cpp
@@ -33,6 +33,8 @@
 
 #include <coreplugin/icore.h>
 
+#include <utils/qtcassert.h>
+
 static const char settingsGroupC[] = "DiffEditor";
 static const char descriptionVisibleKeyC[] = "DescriptionVisible";
 static const char horizontalScrollBarSynchronizationKeyC[] =
@@ -49,6 +51,7 @@ DiffEditorGuiController::DiffEditorGuiController(
       m_syncScrollBars(true),
       m_currentDiffFileIndex(-1)
 {
+    QTC_ASSERT(m_controller, return);
     QSettings *s = Core::ICore::settings();
     s->beginGroup(QLatin1String(settingsGroupC));
     m_descriptionVisible = s->value(QLatin1String(descriptionVisibleKeyC),
diff --git a/src/plugins/diffeditor/diffeditorguicontroller.h b/src/plugins/diffeditor/diffeditorguicontroller.h
index 5a62b9bac59..227dd4f858d 100644
--- a/src/plugins/diffeditor/diffeditorguicontroller.h
+++ b/src/plugins/diffeditor/diffeditorguicontroller.h
@@ -66,7 +66,7 @@ private slots:
     void slotUpdateDiffFileIndex();
 
 private:
-    DiffEditorController *m_controller;
+    DiffEditorController *const m_controller;
     bool m_descriptionVisible;
     bool m_syncScrollBars;
     int m_currentDiffFileIndex;
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index 957050f7e7f..4a1aecff7d3 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -826,11 +826,6 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent)
     clear(tr("No controller"));
 }
 
-SideBySideDiffEditorWidget::~SideBySideDiffEditorWidget()
-{
-
-}
-
 void SideBySideDiffEditorWidget::setDiffEditorGuiController(
         DiffEditorGuiController *controller)
 {
@@ -882,7 +877,6 @@ void SideBySideDiffEditorWidget::setDiffEditorGuiController(
     }
 }
 
-
 DiffEditorGuiController *SideBySideDiffEditorWidget::diffEditorGuiController() const
 {
     return m_guiController;
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.h b/src/plugins/diffeditor/sidebysidediffeditorwidget.h
index 0c9f34a7747..259a27158c7 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.h
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.h
@@ -55,8 +55,7 @@ class DIFFEDITOR_EXPORT SideBySideDiffEditorWidget : public QWidget
 {
     Q_OBJECT
 public:
-    SideBySideDiffEditorWidget(QWidget *parent = 0);
-    ~SideBySideDiffEditorWidget();
+    explicit SideBySideDiffEditorWidget(QWidget *parent = 0);
 
     void setDiffEditorGuiController(DiffEditorGuiController *controller);
     DiffEditorGuiController *diffEditorGuiController() const;