diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 9055056c831..7a7cc902713 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -1704,9 +1704,9 @@ void FakeVimPluginPrivate::setUseFakeVimInternal(bool on) // Context(FAKEVIM_CONTEXT)); resetCommandBuffer(); foreach (IEditor *editor, m_editorToHandler.keys()) { - if (BaseTextEditorWidget *textEditor = - qobject_cast(editor->widget())) { - m_editorToHandler[editor]->restoreWidget(textEditor->tabSettings().m_tabSize); + if (BaseTextDocument *textDocument = + qobject_cast(editor->document())) { + m_editorToHandler[editor]->restoreWidget(textDocument->tabSettings().m_tabSize); } } } diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp index 09549897e92..115e091a643 100644 --- a/src/plugins/qmljseditor/quicktoolbar.cpp +++ b/src/plugins/qmljseditor/quicktoolbar.cpp @@ -328,17 +328,19 @@ void QuickToolBar::setProperty(const QString &propertyName, const QVariant &valu m_editor->convertPosition(changeSetPos + changeSetLength, &endLine, &column); //get line if (line > 0) { - TextEditor::TabSettings ts = m_editor->editorWidget()->tabSettings(); + TextEditor::TabSettings ts = m_editor->baseTextDocument()->tabSettings(); QmlJSIndenter indenter; indenter.setTabSize(ts.m_tabSize); indenter.setIndentSize(ts.m_indentSize); for (int i=line;i<=endLine;i++) { - QTextBlock start = m_editor->editorWidget()->document()->findBlockByNumber(i); - QTextBlock end = m_editor->editorWidget()->document()->findBlockByNumber(i); + QTextBlock start = m_editor->baseTextDocument()->document()->findBlockByNumber(i); + QTextBlock end = m_editor->baseTextDocument()->document()->findBlockByNumber(i); if (end.isValid()) { - const int indent = indenter.indentForBottomLine(m_editor->editorWidget()->document()->begin(), end.next(), QChar::Null); + const int indent = indenter.indentForBottomLine(m_editor->baseTextDocument() + ->document()->begin(), + end.next(), QChar::Null); ts.indentLine(start, indent); } } diff --git a/src/plugins/qnx/bardescriptoreditor.cpp b/src/plugins/qnx/bardescriptoreditor.cpp index 671a34e6772..55dce2f47f9 100644 --- a/src/plugins/qnx/bardescriptoreditor.cpp +++ b/src/plugins/qnx/bardescriptoreditor.cpp @@ -180,7 +180,9 @@ void BarDescriptorEditor::updateCursorPosition() const QTextBlock block = cursor.block(); const int line = block.blockNumber() + 1; const int column = cursor.position() - block.position(); - m_cursorPositionLabel->setText(tr("Line: %1, Col: %2").arg(line).arg(editorWidget->sourceWidget()->tabSettings().columnAt(block.text(), column)+1), + m_cursorPositionLabel->setText(tr("Line: %1, Col: %2").arg(line) + .arg(editorWidget->sourceWidget()->baseTextDocument() + ->tabSettings().columnAt(block.text(), column)+1), tr("Line: 9999, Col: 999")); if (!block.isVisible()) editorWidget->sourceWidget()->ensureCursorVisible(); diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 3862dbf4628..32f1bc29a49 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -1576,7 +1576,8 @@ void BaseTextEditorWidget::keyPressEvent(QKeyEvent *e) cursor.beginEditBlock(); int extraBlocks = - d->m_autoCompleter->paragraphSeparatorAboutToBeInserted(cursor, tabSettings()); + d->m_autoCompleter->paragraphSeparatorAboutToBeInserted(cursor, + d->m_document->tabSettings()); QString previousIndentationString; if (tps.m_autoIndent) { @@ -2633,7 +2634,7 @@ QString BaseTextEditorWidgetPrivate::copyBlockSelection() QTextCursor cursor = q->textCursor(); if (!m_inBlockSelectionMode) return selection; - const TabSettings &ts = q->tabSettings(); + const TabSettings &ts = m_document->tabSettings(); QTextBlock block = m_blockSelection.firstBlock.block(); QTextBlock lastBlock = m_blockSelection.lastBlock.block(); bool textInserted = false; @@ -2681,7 +2682,7 @@ void BaseTextEditorWidgetPrivate::removeBlockSelection(const QString &text) cursor.clearSelection(); cursor.beginEditBlock(); - const TabSettings &ts = q->tabSettings(); + const TabSettings &ts = m_document->tabSettings(); QTextBlock block = m_blockSelection.firstBlock.block(); QTextBlock lastBlock = m_blockSelection.lastBlock.block(); for (;;) { @@ -2968,7 +2969,7 @@ void BaseTextEditorWidget::paintEvent(QPaintEvent *e) && blockFS.position() <= d->m_findScopeEnd.block().position()) { QTextLayout *layout = blockFS.layout(); QString text = blockFS.text(); - const TabSettings &ts = tabSettings(); + const TabSettings &ts = d->m_document->tabSettings(); qreal spacew = QFontMetricsF(font()).width(QLatin1Char(' ')); int offset = 0; @@ -3075,7 +3076,7 @@ void BaseTextEditorWidget::paintEvent(QPaintEvent *e) o.format = range.format; if (i == blockSelectionIndex) { QString text = block.text(); - const TabSettings &ts = tabSettings(); + const TabSettings &ts = d->m_document->tabSettings(); o.start = ts.positionAtColumn(text, d->m_blockSelection.firstVisualColumn); o.length = ts.positionAtColumn(text, d->m_blockSelection.lastVisualColumn) - o.start; } @@ -3127,7 +3128,7 @@ void BaseTextEditorWidget::paintEvent(QPaintEvent *e) && block.position() >= d->m_blockSelection.firstBlock.block().position() && block.position() <= d->m_blockSelection.lastBlock.block().position()) { QString text = block.text(); - const TabSettings &ts = tabSettings(); + const TabSettings &ts = d->m_document->tabSettings(); qreal spacew = QFontMetricsF(font()).width(QLatin1Char(' ')); int offset = 0; @@ -4035,17 +4036,18 @@ void BaseTextEditorWidget::mouseMoveEvent(QMouseEvent *e) if (e->modifiers() & Qt::AltModifier) { if (!d->m_inBlockSelectionMode) { - d->m_blockSelection.fromSelection(tabSettings(), textCursor()); + d->m_blockSelection.fromSelection(d->m_document->tabSettings(), textCursor()); d->m_inBlockSelectionMode = true; } else { QTextCursor cursor = textCursor(); // get visual column - int column = tabSettings().columnAt(cursor.block().text(), cursor.positionInBlock()); + int column = d->m_document->tabSettings().columnAt( + cursor.block().text(), cursor.positionInBlock()); if (cursor.positionInBlock() == cursor.block().length()-1) column += (e->pos().x() - cursorRect().center().x())/QFontMetricsF(font()).width(QLatin1Char(' ')); d->m_blockSelection.moveAnchor(cursor.blockNumber(), column); - setTextCursor(d->m_blockSelection.selection(tabSettings())); + setTextCursor(d->m_blockSelection.selection(d->m_document->tabSettings())); viewport()->update(); } } @@ -4413,11 +4415,6 @@ void BaseTextEditorWidget::toggleBlockVisible(const QTextBlock &block) } -const TabSettings &BaseTextEditorWidget::tabSettings() const -{ - return d->m_document->tabSettings(); -} - void BaseTextEditorWidget::setLanguageSettingsId(Core::Id settingsId) { d->m_tabSettingsId = settingsId; @@ -5229,7 +5226,7 @@ void BaseTextEditorWidget::rewrapParagraph() { const int paragraphWidth = marginSettings().m_marginColumn; const QRegExp anyLettersOrNumbers = QRegExp(QLatin1String("\\w")); - const int tabSize = tabSettings().m_tabSize; + const int tabSize = d->m_document->tabSettings().m_tabSize; QTextCursor cursor = textCursor(); cursor.beginEditBlock(); @@ -5300,7 +5297,8 @@ void BaseTextEditorWidget::rewrapParagraph() QString spacing; if (commonPrefix.isEmpty()) { - spacing = tabSettings().indentationString(0, indentLevel, textCursor().block()); + spacing = d->m_document->tabSettings().indentationString( + 0, indentLevel, textCursor().block()); } else { spacing = commonPrefix; indentLevel = commonPrefix.length(); @@ -6107,7 +6105,9 @@ void BaseTextEditor::updateCursorPosition() const QTextBlock block = cursor.block(); const int line = block.blockNumber() + 1; const int column = cursor.position() - block.position(); - m_cursorPositionLabel->setText(tr("Line: %1, Col: %2").arg(line).arg(m_editorWidget->tabSettings().columnAt(block.text(), column)+1), + m_cursorPositionLabel->setText(tr("Line: %1, Col: %2").arg(line) + .arg(baseTextDocument()->tabSettings().columnAt(block.text(), + column)+1), tr("Line: 9999, Col: 999")); m_contextHelpId.clear(); @@ -6258,7 +6258,7 @@ bool BaseTextEditorWidget::inFindScope(int selectionStart, int selectionEnd) if (block != document()->findBlock(selectionEnd)) return false; QString text = block.text(); - const TabSettings &ts = tabSettings(); + const TabSettings &ts = d->m_document->tabSettings(); int startPosition = ts.positionAtColumn(text, d->m_findScopeVerticalBlockSelectionFirstColumn); int endPosition = ts.positionAtColumn(text, d->m_findScopeVerticalBlockSelectionLastColumn); if (selectionStart - block.position() < startPosition) @@ -6273,7 +6273,7 @@ void BaseTextEditorWidget::setBlockSelection(bool on) if (d->m_inBlockSelectionMode != on) { d->m_inBlockSelectionMode = on; if (on) - d->m_blockSelection.fromSelection(tabSettings(), textCursor()); + d->m_blockSelection.fromSelection(d->m_document->tabSettings(), textCursor()); } viewport()->update(); } @@ -6287,13 +6287,13 @@ void BaseTextEditorWidget::handleBlockSelection(int diff_row, int diff_col) { if (!d->m_inBlockSelectionMode) { - d->m_blockSelection.fromSelection(tabSettings(), textCursor()); + d->m_blockSelection.fromSelection(d->m_document->tabSettings(), textCursor()); d->m_inBlockSelectionMode = true; } d->m_blockSelection.moveAnchor(d->m_blockSelection.anchorBlockNumber() + diff_row, d->m_blockSelection.anchorColumnNumber() + diff_col); - setTextCursor(d->m_blockSelection.selection(tabSettings())); + setTextCursor(d->m_blockSelection.selection(d->m_document->tabSettings())); viewport()->update(); @@ -6402,12 +6402,12 @@ void BaseTextEditorWidget::transformBlockSelection(TransformationMethod method) qSwap(minPos, maxPos); cursor.setPosition(minPos); cursor.setPosition(maxPos, QTextCursor::KeepAnchor); - d->m_blockSelection.fromSelection(tabSettings(), cursor); + d->m_blockSelection.fromSelection(d->m_document->tabSettings(), cursor); d->m_blockSelection.anchor = anchorPosition; d->m_inBlockSelectionMode = true; d->m_blockSelection.firstVisualColumn = leftBound; d->m_blockSelection.lastVisualColumn = rightBound; - setTextCursor(d->m_blockSelection.selection(tabSettings())); + setTextCursor(d->m_blockSelection.selection(d->m_document->tabSettings())); viewport()->update(); } diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h index c97bdca0b0f..9cffec5b04a 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/basetexteditor.h @@ -369,7 +369,6 @@ public: virtual void extraAreaMouseEvent(QMouseEvent *); void updateFoldingHighlight(const QPoint &pos); - const TabSettings &tabSettings() const; void setLanguageSettingsId(Core::Id settingsId); Core::Id languageSettingsId() const;