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

Editors: Remove BaseTextEditorWidget::setBaseTextDocument

Browse Source 
First step in never changing the text document after construction,
because that is actually not really supported.
Second step will be to fix that for the editor duplicate() methods too.

Change-Id: I3d112ba0895e7ee7ac6dd8ae2318f0de7d2cebc9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Eike Ziller
2014-01-09 14:47:00 +01:00
parent 498d198104
commit a3608f595a
11 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,9 +188,19 @@ QString BaseTextEditorWidget::convertToPlainText(const QString &txt)
static const char kTextBlockMimeType[] = "application/vnd.qtcreator.blocktext";
static const char kVerticalTextBlockMimeType[] = "application/vnd.qtcreator.vblocktext";
BaseTextEditorWidget::BaseTextEditorWidget(QWidget *parent)
: QPlainTextEdit(parent)
{
ctor(QSharedPointer<BaseTextDocument>(new BaseTextDocument));
}
BaseTextEditorWidget::BaseTextEditorWidget(BaseTextDocument *doc, QWidget *parent)
: QPlainTextEdit(parent)
{
ctor(QSharedPointer<BaseTextDocument>(doc));
}
void BaseTextEditorWidget::ctor(const QSharedPointer<BaseTextDocument> &doc)
{
d = new BaseTextEditorWidgetPrivate;
d->q = this;
@@ -203,6 +213,7 @@ BaseTextEditorWidget::BaseTextEditorWidget(QWidget *parent)
d->m_searchResultOverlay = new TextEditorOverlay(this);
d->m_refactorOverlay = new RefactorOverlay(this);
d->m_document = doc;
d->setupDocumentSignals(d->m_document);
d->m_lastScrollPos = -1;
@@ -2079,14 +2090,6 @@ void BaseTextEditorWidget::duplicateFrom(BaseTextEditorWidget *widget)
d->m_document = widget->d->m_document;
}
void BaseTextEditorWidget::setBaseTextDocument(const QSharedPointer<BaseTextDocument> &doc)
{
if (!doc.isNull()) {
d->setupDocumentSignals(doc);
d->m_document = doc;
}
}
void BaseTextEditorWidget::documentAboutToBeReloaded()
{
//memorize cursor position
@@ -2405,7 +2408,6 @@ BaseTextEditorWidgetPrivate::BaseTextEditorWidgetPrivate()
q(0),
m_contentsChanged(false),
m_lastCursorChangeWasInteresting(false),
m_document(new BaseTextDocument),
m_parenthesesMatchingEnabled(false),
m_updateTimer(0),
m_formatRange(false),