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

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

@@ -566,17 +566,15 @@ QString BaseTextEditorWidget::convertToPlainText(const QString &txt)
static const char kTextBlockMimeType[] = "application/vnd.qtcreator.blocktext";
BaseTextEditorWidget::BaseTextEditorWidget(BaseTextDocument *doc, QWidget *parent)
BaseTextEditorWidget::BaseTextEditorWidget(QWidget *parent)
: QPlainTextEdit(parent)
{
d = new BaseTextEditorWidgetPrivate(this);
d->ctor(QSharedPointer<BaseTextDocument>(doc));
}
BaseTextEditorWidget::BaseTextEditorWidget(BaseTextEditorWidget *other)
void BaseTextEditorWidget::setTextDocument(const QSharedPointer<BaseTextDocument> &doc)
{
d = new BaseTextEditorWidgetPrivate(this);
d->ctor(other->d->m_document);
d->ctor(doc);
}
void BaseTextEditorWidgetPrivate::ctor(const QSharedPointer<BaseTextDocument> &doc)
@@ -1000,6 +998,11 @@ BaseTextDocument *BaseTextEditorWidget::textDocument() const
return d->m_document.data();
}
BaseTextDocumentPtr BaseTextEditorWidget::textDocumentPtr() const
{
return d->m_document;
}
void BaseTextEditorWidgetPrivate::editorContentsChange(int position, int charsRemoved, int charsAdded)
{
if (m_animator)
@@ -2806,7 +2809,7 @@ AutoCompleter *BaseTextEditor::autoCompleter() const
void BaseTextEditorWidgetPrivate::setupDocumentSignals()
{
QTextDocument *doc = m_document->document();
q->setDocument(doc);
q->QPlainTextEdit::setDocument(doc);
q->setCursorWidth(2); // Applies to the document layout
BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout());
@@ -7096,7 +7099,8 @@ void BaseTextEditorWidget::setupAsPlainEditor()
IEditor *BaseTextEditor::duplicate()
{
auto newWidget = new BaseTextEditorWidget(editorWidget());
auto newWidget = new BaseTextEditorWidget(0);
newWidget->setTextDocument(editorWidget()->textDocumentPtr());
newWidget->setupAsPlainEditor();
TextEditorSettings::initializeEditor(newWidget);
auto editor = newWidget->editor();