diff --git a/src/libs/utils/changeset.cpp b/src/libs/utils/changeset.cpp index fa4e6696431..b5d3dc2f93a 100644 --- a/src/libs/utils/changeset.cpp +++ b/src/libs/utils/changeset.cpp @@ -318,6 +318,12 @@ void ChangeSet::apply(QTextCursor *textCursor) m_cursor = nullptr; } +void ChangeSet::apply(QTextDocument *document) +{ + QTextCursor c(document); + apply(&c); +} + QString ChangeSet::textAt(int pos, int length) { if (m_string) { diff --git a/src/libs/utils/changeset.h b/src/libs/utils/changeset.h index a6853c75f5d..915cee3778d 100644 --- a/src/libs/utils/changeset.h +++ b/src/libs/utils/changeset.h @@ -10,6 +10,7 @@ QT_BEGIN_NAMESPACE class QTextCursor; +class QTextDocument; QT_END_NAMESPACE namespace Utils { @@ -76,6 +77,7 @@ public: void apply(QString *s); void apply(QTextCursor *textCursor); + void apply(QTextDocument *document); private: // length-based API. diff --git a/src/plugins/cppeditor/cppcodestylesettingspage.cpp b/src/plugins/cppeditor/cppcodestylesettingspage.cpp index 84573bdeed5..88be950193b 100644 --- a/src/plugins/cppeditor/cppcodestylesettingspage.cpp +++ b/src/plugins/cppeditor/cppcodestylesettingspage.cpp @@ -76,8 +76,7 @@ static void applyRefactorings(QTextDocument *textDocument, TextEditorWidget *edi Utils::ChangeSet change = formatter.format(cppDocument->translationUnit()->ast()); // Apply change - QTextCursor cursor(textDocument); - change.apply(&cursor); + change.apply(textDocument); } // ------------------ CppCodeStyleSettingsWidget diff --git a/src/plugins/cppeditor/cppcompletion_test.cpp b/src/plugins/cppeditor/cppcompletion_test.cpp index 1e212dde609..a61f0707ec3 100644 --- a/src/plugins/cppeditor/cppcompletion_test.cpp +++ b/src/plugins/cppeditor/cppcompletion_test.cpp @@ -135,8 +135,7 @@ public: { Utils::ChangeSet change; change.insert(m_position, QLatin1String(text)); - QTextCursor cursor(m_textDocument); - change.apply(&cursor); + change.apply(m_textDocument); m_position += text.length(); } diff --git a/src/plugins/cppeditor/cpppointerdeclarationformatter_test.cpp b/src/plugins/cppeditor/cpppointerdeclarationformatter_test.cpp index 9072938b0f7..22fb303c476 100644 --- a/src/plugins/cppeditor/cpppointerdeclarationformatter_test.cpp +++ b/src/plugins/cppeditor/cpppointerdeclarationformatter_test.cpp @@ -107,8 +107,7 @@ public: Utils::ChangeSet change = formatter.format(ast); // ChangeSet may be empty. // Apply change - QTextCursor changeCursor(qtextDocument); - change.apply(&changeCursor); + change.apply(qtextDocument); // Compare QCOMPARE(qtextDocument->toPlainText(), expectedSource); diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp index cce60c03cf9..4d95818d838 100644 --- a/src/plugins/qmljseditor/quicktoolbar.cpp +++ b/src/plugins/qmljseditor/quicktoolbar.cpp @@ -318,8 +318,7 @@ void QuickToolBar::removeProperty(const QString &propertyName) Utils::ChangeSet changeSet; Rewriter rewriter(m_doc->source(), &changeSet, m_propertyOrder); rewriter.removeBindingByName(initializer, propertyName); - QTextCursor tc(m_editorWidget->document()); - changeSet.apply(&tc); + changeSet.apply(m_editorWidget->document()); } } }