diff options
| author | hjk <hjk121@nokiamail.com> | 2014-09-02 13:22:56 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-09-03 13:05:46 +0200 |
| commit | 877bf3b30529e65c5f712f1a38b888a988b3276c (patch) | |
| tree | 3219af80a8dcd3b8f5bdfab492caf15b2edc0510 /src/plugins/texteditor/basetexteditor.cpp | |
| parent | 37a1e8d288ba42459432d643b2b991f2f89c6886 (diff) | |
TextEditor: Remove some refactoring glue
Change-Id: I2f771b4f944c7f23ad43f780ec98937593e400ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src/plugins/texteditor/basetexteditor.cpp')
| -rw-r--r-- | src/plugins/texteditor/basetexteditor.cpp | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 3d485eeb45..1df8e537b1 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -6557,11 +6557,6 @@ BaseTextEditor::BaseTextEditor() setDuplicateSupported(true); } -void BaseTextEditor::setEditorWidget(BaseTextEditorWidget *widget) -{ - setWidget(widget); -} - BaseTextEditor::~BaseTextEditor() { delete m_widget; @@ -6570,8 +6565,9 @@ BaseTextEditor::~BaseTextEditor() BaseTextDocument *BaseTextEditor::textDocument() const { - ensureDocument(); - return editorWidget()->textDocument(); + BaseTextEditorWidget *widget = editorWidget(); + QTC_CHECK(!widget->d->m_document.isNull()); + return widget->d->m_document.data(); } void BaseTextEditor::addContext(Id id) @@ -7188,25 +7184,6 @@ IEditor *BaseTextEditor::duplicate() return 0; } -QWidget *BaseTextEditor::widget() const -{ - return ensureWidget(); -} - -BaseTextEditorWidget *BaseTextEditor::ensureWidget() const -{ - return editorWidget(); -} - -BaseTextDocumentPtr BaseTextEditor::ensureDocument() const -{ - BaseTextEditorWidget *widget = ensureWidget(); - if (widget->d->m_document.isNull()) { - QTC_ASSERT(!d->m_origin, return BaseTextDocumentPtr()); // New style always sets it. - } - return widget->textDocumentPtr(); -} - // // BaseTextEditorFactory |