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

TextEditor: Shuffle some convenience functions

Browse Source 
Remove rarely used ones, add a currentTextEditorWidget()

Change-Id: I27b97c17927c71e07dc3b489785b7f2f76eb801e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
hjk
2014-09-30 17:35:35 +02:00
parent 577fcd97d4
commit 96be6ae15f
7 changed files with 32 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,25 +220,22 @@ QString BeautifierPlugin::format(const QString &text, const Command &command,
void BeautifierPlugin::formatCurrentFile(const Command &command)
{
QPlainTextEdit *textEditor = 0;
QString filePath;
if (BaseTextEditor *editor = BaseTextEditor::currentTextEditor()) {
textEditor = editor->editorWidget();
filePath = editor->document()->filePath();
}
if (!textEditor)
TextEditorWidget *widget = TextEditorWidget::currentTextEditorWidget();
if (!widget)
return;
const QString sourceData = textEditor->toPlainText();
const QString sourceData = widget->toPlainText();
if (sourceData.isEmpty())
return;
QFutureWatcher<FormatTask> *watcher = new QFutureWatcher<FormatTask>;
connect(textEditor->document(), SIGNAL(contentsChanged()), watcher, SLOT(cancel()));
connect(widget->textDocument(), &TextDocument::contentsChanged,
watcher, &QFutureWatcher<FormatTask>::cancel);
connect(watcher, SIGNAL(finished()), m_asyncFormatMapper, SLOT(map()));
m_asyncFormatMapper->setMapping(watcher, watcher);
const QString filePath = widget->textDocument()->filePath();
watcher->setFuture(QtConcurrent::run(&BeautifierPlugin::formatAsync, this,
FormatTask(textEditor, filePath, sourceData, command)));
FormatTask(widget, filePath, sourceData, command)));
}
void BeautifierPlugin::formatAsync(QFutureInterface<FormatTask> &future, FormatTask task)