From 372014b843ac66f4aa209da76c0b45d3dca8b476 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Tue, 12 Nov 2019 12:43:16 +0100 Subject: [PATCH] Editor: Rename format -> autoIndent Renaming the auto indent function triggered by Ctrl+I to make room for a real format action. Change-Id: If5731353311030d66a20f1093a7fdd300703ebbc Reviewed-by: Christian Stenger --- src/plugins/clangformat/clangformatbaseindenter.cpp | 6 +++--- src/plugins/clangformat/clangformatbaseindenter.h | 9 ++++----- src/plugins/texteditor/indenter.h | 8 ++++---- src/plugins/texteditor/textdocument.cpp | 2 +- src/plugins/texteditor/texteditor.cpp | 2 +- src/plugins/texteditor/texteditor.h | 2 +- src/plugins/texteditor/texteditoractionhandler.cpp | 2 +- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp index c7968a5c1c0..95c11bcd621 100644 --- a/src/plugins/clangformat/clangformatbaseindenter.cpp +++ b/src/plugins/clangformat/clangformatbaseindenter.cpp @@ -697,9 +697,9 @@ bool ClangFormatBaseIndenter::isElectricCharacter(const QChar &ch) const return false; } -void ClangFormatBaseIndenter::formatOrIndent(const QTextCursor &cursor, - const TextEditor::TabSettings & /*tabSettings*/, - int cursorPositionInEditor) +void ClangFormatBaseIndenter::autoIndent(const QTextCursor &cursor, + const TextEditor::TabSettings & /*tabSettings*/, + int cursorPositionInEditor) { if (formatCodeInsteadOfIndent()) { QTextBlock start; diff --git a/src/plugins/clangformat/clangformatbaseindenter.h b/src/plugins/clangformat/clangformatbaseindenter.h index 87b5e0c927b..9f58dd590b2 100644 --- a/src/plugins/clangformat/clangformatbaseindenter.h +++ b/src/plugins/clangformat/clangformatbaseindenter.h @@ -50,11 +50,10 @@ public: const TextEditor::TabSettings &tabSettings, int cursorPositionInEditor = -1) override; - void formatOrIndent(const QTextCursor &cursor, - const TextEditor::TabSettings &tabSettings, - int cursorPositionInEditor = -1) override; - TextEditor::Replacements format( - const TextEditor::RangesInLines &rangesInLines = TextEditor::RangesInLines()) override; + void autoIndent(const QTextCursor &cursor, + const TextEditor::TabSettings &tabSettings, + int cursorPositionInEditor = -1) override; + TextEditor::Replacements format(const TextEditor::RangesInLines &rangesInLines) override; void indentBlock(const QTextBlock &block, const QChar &typedChar, diff --git a/src/plugins/texteditor/indenter.h b/src/plugins/texteditor/indenter.h index c377085d9ac..f7f2d1da3a2 100644 --- a/src/plugins/texteditor/indenter.h +++ b/src/plugins/texteditor/indenter.h @@ -92,15 +92,15 @@ public: return -1; } - virtual void formatOrIndent(const QTextCursor &cursor, - const TabSettings &tabSettings, - int cursorPositionInEditor = -1) + virtual void autoIndent(const QTextCursor &cursor, + const TabSettings &tabSettings, + int cursorPositionInEditor = -1) { indent(cursor, QChar::Null, tabSettings, cursorPositionInEditor); } // By default just calls indent with default settings. - virtual Replacements format(const RangesInLines & /*rangesInLines*/ = RangesInLines()) + virtual Replacements format(const RangesInLines & /*rangesInLines*/) { return Replacements(); } diff --git a/src/plugins/texteditor/textdocument.cpp b/src/plugins/texteditor/textdocument.cpp index 07641e86b8a..02dfaea7e31 100644 --- a/src/plugins/texteditor/textdocument.cpp +++ b/src/plugins/texteditor/textdocument.cpp @@ -493,7 +493,7 @@ void TextDocument::autoReindent(const QTextCursor &cursor, int currentCursorPosi void TextDocument::autoFormatOrIndent(const QTextCursor &cursor) { - d->m_indenter->formatOrIndent(cursor, tabSettings()); + d->m_indenter->autoIndent(cursor, tabSettings()); } QTextCursor TextDocument::indent(const QTextCursor &cursor, bool blockSelection, int column, diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 35281ae54d2..32649c7ba06 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -7058,7 +7058,7 @@ void TextEditorWidget::setIfdefedOutBlocks(const QList &blocks) documentLayout->requestUpdate(); } -void TextEditorWidget::format() +void TextEditorWidget::autoIndent() { QTextCursor cursor = textCursor(); cursor.beginEditBlock(); diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h index dddfa54868a..9e9319cc057 100644 --- a/src/plugins/texteditor/texteditor.h +++ b/src/plugins/texteditor/texteditor.h @@ -345,7 +345,7 @@ public: virtual void cut(); virtual void selectAll(); - virtual void format(); + virtual void autoIndent(); virtual void rewrapParagraph(); virtual void unCommentSelection(); diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index e34ac19dee0..3508d089c52 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -324,7 +324,7 @@ void TextEditorActionHandlerPrivate::createActions() // register "Edit -> Advanced" Menu Actions Core::ActionContainer *advancedEditMenu = Core::ActionManager::actionContainer(M_EDIT_ADVANCED); m_formatAction = registerAction(AUTO_INDENT_SELECTION, - [] (TextEditorWidget *w) { w->format(); }, true, tr("Auto-&indent Selection"), + [] (TextEditorWidget *w) { w->autoIndent(); }, true, tr("Auto-&indent Selection"), QKeySequence(tr("Ctrl+I")), G_EDIT_FORMAT, advancedEditMenu); m_rewrapParagraphAction = registerAction(REWRAP_PARAGRAPH,