TextEditor: Further *Editor/*EditorWidget disentangling

In most cases, the *Editor constructor does not need to
access the *EditorWidget.

Change-Id: I1f5c076a0f723d5d82b398e8c250c7bd1d47eb17
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

src/plugins/diffeditor/diffeditor.cpp

@@ -83,12 +83,7 @@ public slots:
     void setDisplaySettings(const DisplaySettings &ds);
 
 protected:
-    BaseTextEditor *createEditor()
-    {
-        BaseTextEditor *editor = new BaseTextEditor(this);
-        editor->document()->setId("DiffEditor.DescriptionEditor");
-        return editor;
-    }
+    BaseTextEditor *createEditor() { return new BaseTextEditor; }
     void mouseMoveEvent(QMouseEvent *e);
     void mouseReleaseEvent(QMouseEvent *e);
 
@@ -103,7 +98,7 @@ private:
 DescriptionEditorWidget::DescriptionEditorWidget(QWidget *parent)
     : BaseTextEditorWidget(parent)
 {
-    setTextDocument(BaseTextDocumentPtr(new BaseTextDocument));
+    setSimpleTextDocument("DiffEditor.DescriptionEditor");
     DisplaySettings settings = displaySettings();
     settings.m_textWrapping = false;
     settings.m_displayLineNumbers = false;

src/plugins/diffeditor/diffeditor.h

@@ -63,7 +63,6 @@ public:
 public:
     DiffEditorController *controller() const;
 
-    // Core::IEditor
     Core::IEditor *duplicate();
 
     bool open(QString *errorString,

src/plugins/diffeditor/selectabletexteditorwidget.cpp

@@ -38,13 +38,12 @@ namespace DiffEditor {
 SelectableTextEditorWidget::SelectableTextEditorWidget(QWidget *parent)
     : BaseTextEditorWidget(parent)
 {
-    setTextDocument(TextEditor::BaseTextDocumentPtr(new TextEditor::BaseTextDocument));
+    setSimpleTextDocument("DiffEditor.UnifiedDiffEditor");
     setFrameStyle(QFrame::NoFrame);
 }
 
 SelectableTextEditorWidget::~SelectableTextEditorWidget()
 {
-
 }
 
 void SelectableTextEditorWidget::paintEvent(QPaintEvent *e)

src/plugins/diffeditor/selectabletexteditorwidget.h

@@ -54,8 +54,7 @@ class DIFFEDITOR_EXPORT SelectableTextEditorWidget
 public:
     SelectableTextEditorWidget(QWidget *parent = 0);
     ~SelectableTextEditorWidget();
-    void setSelections(const QMap<int,
-                       QList<DiffSelection> > &selections) {
+    void setSelections(const QMap<int, QList<DiffSelection> > &selections) {
         m_selections = selections;
     }
 

src/plugins/diffeditor/sidebysidediffeditorwidget.cpp

@@ -78,10 +78,8 @@ class SideDiffEditor : public BaseTextEditor
 {
     Q_OBJECT
 public:
-    SideDiffEditor(BaseTextEditorWidget *editorWidget)
-        : BaseTextEditor(editorWidget)
+    SideDiffEditor()
     {
-        document()->setId("DiffEditor.SideDiffEditor");
         connect(this, SIGNAL(tooltipRequested(TextEditor::BaseTextEditor*,QPoint,int)),
                 this, SLOT(slotTooltipRequested(TextEditor::BaseTextEditor*,QPoint,int)));
     }
@@ -170,7 +168,7 @@ protected:
         return SelectableTextEditorWidget::extraAreaWidth(markWidthPtr);
     }
     void applyFontSettings();
-    BaseTextEditor *createEditor() { return new SideDiffEditor(this); }
+    BaseTextEditor *createEditor() { return new SideDiffEditor; }
     virtual QString lineNumber(int blockNumber) const;
     virtual int lineNumberDigits() const;
     virtual bool selectionVisible(int blockNumber) const;
@@ -326,6 +324,7 @@ SideDiffEditorWidget::SideDiffEditorWidget(QWidget *parent)
       m_lineNumberDigits(1),
       m_inPaintEvent(false)
 {
+    textDocument()->setId("DiffEditor.SideDiffEditor");
     DisplaySettings settings = displaySettings();
     settings.m_textWrapping = false;
     settings.m_displayLineNumbers = true;

src/plugins/diffeditor/unifieddiffeditorwidget.cpp

@@ -71,16 +71,6 @@ using namespace TextEditor;
 
 namespace DiffEditor {
 
-class UnifiedDiffEditor : public BaseTextEditor
-{
-    Q_OBJECT
-public:
-    UnifiedDiffEditor(BaseTextEditorWidget *editorWidget)
-        : BaseTextEditor(editorWidget) {
-        document()->setId("DiffEditor.UnifiedDiffEditor");
-    }
-};
-
 UnifiedDiffEditorWidget::UnifiedDiffEditorWidget(QWidget *parent)
     : SelectableTextEditorWidget(parent)
     , m_guiController(0)
@@ -389,7 +379,7 @@ void UnifiedDiffEditorWidget::patch(int diffFileIndex, int chunkIndex, bool reve
 
 TextEditor::BaseTextEditor *UnifiedDiffEditorWidget::createEditor()
 {
-    return new UnifiedDiffEditor(this);
+    return new BaseTextEditor;
 }
 
 void UnifiedDiffEditorWidget::clear(const QString &message)
@@ -844,5 +834,3 @@ void UnifiedDiffEditorWidget::setCurrentDiffFileIndex(int diffFileIndex)
 }
 
 } // namespace DiffEditor
-
-#include "unifieddiffeditorwidget.moc"