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

TextEditor: Remove some refactoring glue

Browse Source 
Change-Id: I2f771b4f944c7f23ad43f780ec98937593e400ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-09-02 13:22:56 +02:00
parent 37a1e8d288
commit 877bf3b305
5 changed files with 6 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -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