TextEditor: Merge the two sets of *EditorWidget constructors

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

src/plugins/qmljseditor/qmljseditor.cpp

@@ -97,21 +97,12 @@ using namespace QmlJSTools;
 namespace QmlJSEditor {
 namespace Internal {
 
-QmlJSTextEditorWidget::QmlJSTextEditorWidget(QWidget *parent) :
-    TextEditor::BaseTextEditorWidget(new QmlJSEditorDocument, parent)
+QmlJSTextEditorWidget::QmlJSTextEditorWidget(TextEditor::BaseTextDocumentPtr doc)
+    : TextEditor::BaseTextEditorWidget(0)
 {
-    ctor();
-}
+    setTextDocument(doc);
 
-QmlJSTextEditorWidget::QmlJSTextEditorWidget(QmlJSTextEditorWidget *other)
-    : TextEditor::BaseTextEditorWidget(other)
-{
-    ctor();
-}
-
-void QmlJSTextEditorWidget::ctor()
-{
-    m_qmlJsEditorDocument = static_cast<QmlJSEditorDocument *>(textDocument());
+    m_qmlJsEditorDocument = static_cast<QmlJSEditorDocument *>(doc.data());
     m_outlineCombo = 0;
     m_contextPane = 0;
     m_findReferences = new FindReferences(this);
@@ -177,8 +168,7 @@ QModelIndex QmlJSTextEditorWidget::outlineModelIndex()
 
 IEditor *QmlJSEditor::duplicate()
 {
-    QmlJSTextEditorWidget *newEditor = new QmlJSTextEditorWidget(
-                qobject_cast<QmlJSTextEditorWidget *>(editorWidget()));
+    QmlJSTextEditorWidget *newEditor = new QmlJSTextEditorWidget(editorWidget()->textDocumentPtr());
     TextEditor::TextEditorSettings::initializeEditor(newEditor);
     return newEditor->editor();
 }

src/plugins/qmljseditor/qmljseditor.h

@@ -74,8 +74,7 @@ class QmlJSTextEditorWidget : public TextEditor::BaseTextEditorWidget
     Q_OBJECT
 
 public:
-    QmlJSTextEditorWidget(QWidget *parent = 0);
-    QmlJSTextEditorWidget(QmlJSTextEditorWidget *other);
+    QmlJSTextEditorWidget(TextEditor::BaseTextDocumentPtr doc);
     ~QmlJSTextEditorWidget();
 
     QmlJSEditorDocument *qmlJsEditorDocument() const;
@@ -124,8 +123,6 @@ protected:
     QString foldReplacementText(const QTextBlock &block) const;
 
 private:
-    QmlJSTextEditorWidget(TextEditor::BaseTextEditorWidget *); // avoid stupidity
-    void ctor();
     bool isClosingBrace(const QList<QmlJS::Token> &tokens) const;
 
     void setSelectedElements();

src/plugins/qmljseditor/qmljseditorfactory.cpp

@@ -28,6 +28,7 @@
 ****************************************************************************/
 
 #include "qmljseditorfactory.h"
+#include "qmljseditordocument.h"
 #include "qmljseditoreditable.h"
 #include "qmljseditor.h"
 #include "qmljseditorconstants.h"
@@ -64,7 +65,7 @@ QmlJSEditorFactory::QmlJSEditorFactory(QObject *parent)
 
 Core::IEditor *QmlJSEditorFactory::createEditor()
 {
-    QmlJSTextEditorWidget *rc = new QmlJSTextEditorWidget();
+    QmlJSTextEditorWidget *rc = new QmlJSTextEditorWidget(TextEditor::BaseTextDocumentPtr(new QmlJSEditorDocument));
     TextEditor::TextEditorSettings::initializeEditor(rc);
     return rc->editor();
 }