diff options
Diffstat (limited to 'src/plugins/texteditor/refactoringchanges.cpp')
| -rw-r--r-- | src/plugins/texteditor/refactoringchanges.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp index 9e91463349..0ee7410b41 100644 --- a/src/plugins/texteditor/refactoringchanges.cpp +++ b/src/plugins/texteditor/refactoringchanges.cpp @@ -31,8 +31,9 @@ #include <coreplugin/dialogs/readonlyfilesdialog.h> #include <coreplugin/documentmanager.h> #include <coreplugin/editormanager/editormanager.h> -#include <utils/qtcassert.h> +#include <utils/algorithm.h> #include <utils/fileutils.h> +#include <utils/qtcassert.h> #include <QFile> #include <QFileInfo> @@ -312,7 +313,7 @@ bool RefactoringFile::apply() { // test file permissions if (!QFileInfo(fileName()).isWritable()) { - ReadOnlyFilesDialog roDialog(FilePath::fromString(fileName()), ICore::mainWindow()); + ReadOnlyFilesDialog roDialog(FilePath::fromString(fileName()), ICore::dialogParent()); const QString &failDetailText = QApplication::translate("RefactoringFile::apply", "Refactoring cannot be applied."); roDialog.setShowFailWarning(true, failDetailText); @@ -343,6 +344,9 @@ bool RefactoringFile::apply() else c.beginEditBlock(); + sort(m_indentRanges); + sort(m_reindentRanges); + // build indent selections now, applying the changeset will change locations const RefactoringSelections &indentSelections = RefactoringChanges::rangesToSelections(doc, m_indentRanges); |