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

TextEditor: Introduce some convenience text accessors in the editor

Browse Source 
And adjust users.

Change-Id: I9329257cfa5f3298731deb07c2881bc37d9a051d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-08-27 11:57:32 +02:00
parent d2c243464e
commit 2a5c602341
19 changed files with 111 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/beautifier/beautifierplugin.cpp
View File

@@ -63,6 +63,8 @@
#include <QTimer>
#include <QtPlugin>
using namespace TextEditor;
namespace Beautifier {
namespace Internal {
@@ -219,9 +221,8 @@ void BeautifierPlugin::formatCurrentFile(const Command &command)
{
QPlainTextEdit *textEditor = 0;
QString filePath;
if (TextEditor::BaseTextEditor *editor
= qobject_cast<TextEditor::BaseTextEditor *>(Core::EditorManager::currentEditor())) {
textEditor = qobject_cast<QPlainTextEdit *>(editor->editorWidget());
if (BaseTextEditor *editor = BaseTextEditor::currentTextEditor()) {
textEditor = editor->editorWidget();
filePath = editor->document()->filePath();
}
if (!textEditor)
@@ -284,11 +285,10 @@ void BeautifierPlugin::formatCurrentFileContinue(QObject *watcher)
QList<int> foldedBlocks;
QTextBlock block = textEditor->document()->firstBlock();
while (block.isValid()) {
if (const TextEditor::TextBlockUserData *userdata
= static_cast<TextEditor::TextBlockUserData *>(block.userData())) {
if (const TextBlockUserData *userdata = static_cast<TextBlockUserData *>(block.userData())) {
if (userdata->folded()) {
foldedBlocks << block.blockNumber();
TextEditor::BaseTextDocumentLayout::doFoldOrUnfold(block, true);
BaseTextDocumentLayout::doFoldOrUnfold(block, true);
}
}
block = block.next();
@@ -386,7 +386,7 @@ void BeautifierPlugin::formatCurrentFileContinue(QObject *watcher)
for (int i = 0; i < total; ++i) {
QTextBlock block = doc->findBlockByNumber(qMax(0, foldedBlocks.at(i)));
if (block.isValid())
TextEditor::BaseTextDocumentLayout::doFoldOrUnfold(block, false);
BaseTextDocumentLayout::doFoldOrUnfold(block, false);
}
textEditor->document()->setModified(true);