feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Merge the two sets of *EditorWidget constructors

Browse Source 
Change-Id: I45d87d0be722ac36d64af222f03f8cb76242c9df
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-08-18 17:49:04 +02:00
parent 2c5231b468
commit d2ec7d80d9
39 changed files with 114 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -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();
}