diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 8f9b4075db359a81b0c714778bedfb3fd37fba3d..5eeba0bc256fda00ed3a78bb0fe724690668aeeb 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -1268,7 +1268,7 @@ bool CPPEditor::isElectricCharacter(const QChar &ch) const return false; } -bool CPPEditor::contextAllowsAutoParenthesis(const QTextCursor &cursor) const +bool CPPEditor::contextAllowsAutoParentheses(const QTextCursor &cursor) const { CPlusPlus::TokenUnderCursor tokenUnderCursor; const SimpleToken tk = tokenUnderCursor(cursor); diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index 224033d182ea619d60d4f46c0ea5d788d67ca10b..82368bd0903978fa73aa7a0bd3d34b80034d9e8c 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -213,7 +213,7 @@ protected: // These override BaseTextEditor bool isElectricCharacter(const QChar &ch) const; - bool contextAllowsAutoParenthesis(const QTextCursor &cursor) const; + bool contextAllowsAutoParentheses(const QTextCursor &cursor) const; private Q_SLOTS: void updateFileName(); diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 97d9b6f4fd27490118a4a0ff9550467c5f56300e..121d84cb2248b8f826a1d47bd833331e3c3a78a9 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -1121,10 +1121,10 @@ void BaseTextEditor::keyPressEvent(QKeyEvent *e) if (!electricChar.isNull()) cursor.beginEditBlock(); - bool insertAutoParenthesis = !autoText.isEmpty() && contextAllowsAutoParenthesis(cursor); + bool insertAutoParentheses = !autoText.isEmpty() && contextAllowsAutoParentheses(cursor); cursor.insertText(text); - if (insertAutoParenthesis) { + if (insertAutoParentheses) { int pos = cursor.position(); cursor.insertText(autoText); cursor.setPosition(pos); @@ -3329,7 +3329,7 @@ bool BaseTextEditor::isElectricCharacter(const QChar &) const return false; } -bool BaseTextEditor::contextAllowsAutoParenthesis(const QTextCursor &) const +bool BaseTextEditor::contextAllowsAutoParentheses(const QTextCursor &) const { return true; } diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h index 6477ab71e1dd9db2e427386f507f0599dacac3d4..efaae0024ebf8984a109af1098299394323d6f77 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/basetexteditor.h @@ -509,7 +509,7 @@ protected: // Returns true if key triggers an indent. virtual bool isElectricCharacter(const QChar &ch) const; // Returns true if automatic brace matching should be enabled in the context of the given cursor - virtual bool contextAllowsAutoParenthesis(const QTextCursor &cursor) const; + virtual bool contextAllowsAutoParentheses(const QTextCursor &cursor) const; // Indent a text block based on previous line. Default does nothing virtual void indentBlock(QTextDocument *doc, QTextBlock block, QChar typedChar); // Indent at cursor. Calls indentBlock for selection or current line.