From 6875a50d27443d5f1c9acb11ef1135a99911ca9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Mon, 14 Jun 2010 16:06:42 +0200 Subject: [PATCH] Don't pass QChar as const & since it's just a unsigned short Reviewed-by: ogoffart --- src/libs/cplusplus/MatchingText.cpp | 6 +++--- src/libs/cplusplus/MatchingText.h | 4 ++-- src/plugins/cppeditor/cppeditor.cpp | 4 ++-- src/plugins/cppeditor/cppeditor.h | 4 ++-- src/plugins/qmljseditor/qmljscodecompletion.cpp | 2 +- src/plugins/qmljseditor/qmljscodecompletion.h | 2 +- src/plugins/qmljseditor/qmljseditor.cpp | 16 ++++++++-------- src/plugins/qmljseditor/qmljseditor.h | 4 ++-- src/plugins/texteditor/basetexteditor.cpp | 4 ++-- src/plugins/texteditor/basetexteditor.h | 4 ++-- src/shared/proparser/ioutils.cpp | 2 +- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp index b0c5461f24b..a20d2371ac5 100644 --- a/src/libs/cplusplus/MatchingText.cpp +++ b/src/libs/cplusplus/MatchingText.cpp @@ -38,7 +38,7 @@ using namespace CPlusPlus; enum { MAX_NUM_LINES = 20 }; -static bool shouldOverrideChar(const QChar &ch) +static bool shouldOverrideChar(QChar ch) { switch (ch.unicode()) { case ')': case ']': case ';': case '"': case '\'': @@ -84,7 +84,7 @@ bool MatchingText::shouldInsertMatchingText(const QTextCursor &tc) return shouldInsertMatchingText(doc->characterAt(tc.selectionEnd())); } -bool MatchingText::shouldInsertMatchingText(const QChar &lookAhead) +bool MatchingText::shouldInsertMatchingText(QChar lookAhead) { switch (lookAhead.unicode()) { case '{': case '}': @@ -101,7 +101,7 @@ bool MatchingText::shouldInsertMatchingText(const QChar &lookAhead) } QString MatchingText::insertMatchingBrace(const QTextCursor &cursor, const QString &textToProcess, - const QChar &la, int *skippedChars) const + QChar la, int *skippedChars) const { QTextCursor tc = cursor; QTextDocument *doc = tc.document(); diff --git a/src/libs/cplusplus/MatchingText.h b/src/libs/cplusplus/MatchingText.h index 6c83970e92d..56d1db33714 100644 --- a/src/libs/cplusplus/MatchingText.h +++ b/src/libs/cplusplus/MatchingText.h @@ -42,10 +42,10 @@ public: MatchingText(); static bool shouldInsertMatchingText(const QTextCursor &tc); - static bool shouldInsertMatchingText(const QChar &lookAhead); + static bool shouldInsertMatchingText(QChar lookAhead); QString insertMatchingBrace(const QTextCursor &tc, const QString &text, - const QChar &la, int *skippedChars) const; + QChar la, int *skippedChars) const; QString insertParagraphSeparator(const QTextCursor &tc) const; private: diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index d7f0aaa77b8..1b4e59c82c0 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -1547,7 +1547,7 @@ SemanticInfo CPPEditor::semanticInfo() const return m_lastSemanticInfo; } -bool CPPEditor::isElectricCharacter(const QChar &ch) const +bool CPPEditor::isElectricCharacter(QChar ch) const { if (ch == QLatin1Char('{') || ch == QLatin1Char('}') || @@ -1559,7 +1559,7 @@ bool CPPEditor::isElectricCharacter(const QChar &ch) const } QString CPPEditor::insertMatchingBrace(const QTextCursor &tc, const QString &text, - const QChar &la, int *skippedChars) const + QChar la, int *skippedChars) const { MatchingText m; return m.insertMatchingBrace(tc, text, la, skippedChars); diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index b922434117a..35ba10f759d 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -212,10 +212,10 @@ protected: TextEditor::BaseTextEditorEditable *createEditableInterface(); // These override BaseTextEditor - virtual bool isElectricCharacter(const QChar &ch) const; + virtual bool isElectricCharacter(QChar ch) const; virtual QString insertMatchingBrace(const QTextCursor &tc, const QString &text, - const QChar &la, int *skippedChars) const; + QChar la, int *skippedChars) const; virtual QString insertParagraphSeparator(const QTextCursor &tc) const; diff --git a/src/plugins/qmljseditor/qmljscodecompletion.cpp b/src/plugins/qmljseditor/qmljscodecompletion.cpp index 556d0a903c6..2c67687259a 100644 --- a/src/plugins/qmljseditor/qmljscodecompletion.cpp +++ b/src/plugins/qmljseditor/qmljscodecompletion.cpp @@ -567,7 +567,7 @@ bool CodeCompletion::maybeTriggersCompletion(TextEditor::ITextEditable *editor) return false; } -bool CodeCompletion::isDelimiter(const QChar &ch) const +bool CodeCompletion::isDelimiter(QChar ch) const { switch (ch.unicode()) { case '{': diff --git a/src/plugins/qmljseditor/qmljscodecompletion.h b/src/plugins/qmljseditor/qmljscodecompletion.h index 6046f6f7d98..283b3768fa7 100644 --- a/src/plugins/qmljseditor/qmljscodecompletion.h +++ b/src/plugins/qmljseditor/qmljscodecompletion.h @@ -78,7 +78,7 @@ private: void updateSnippets(); bool maybeTriggersCompletion(TextEditor::ITextEditable *editor); - bool isDelimiter(const QChar &ch) const; + bool isDelimiter(QChar ch) const; void addCompletions(const QHash &newCompletions, const QIcon &icon); diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 0348812557f..f8e92136d12 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -82,9 +82,7 @@ using namespace QmlJS; using namespace QmlJS::AST; using namespace QmlJSEditor::Internal; -namespace { - -int blockBraceDepth(const QTextBlock &block) +static int blockBraceDepth(const QTextBlock &block) { int state = block.userState(); if (state == -1) @@ -93,7 +91,7 @@ int blockBraceDepth(const QTextBlock &block) return (state >> 8) & 0xFF; } -int blockStartState(const QTextBlock &block) +static int blockStartState(const QTextBlock &block) { int state = block.userState(); @@ -103,7 +101,7 @@ int blockStartState(const QTextBlock &block) return state & 0xff; } -bool shouldInsertMatchingText(const QChar &lookAhead) +static bool shouldInsertMatchingText(QChar lookAhead) { switch (lookAhead.unicode()) { case '{': case '}': @@ -120,12 +118,14 @@ bool shouldInsertMatchingText(const QChar &lookAhead) } // switch } -bool shouldInsertMatchingText(const QTextCursor &tc) +static bool shouldInsertMatchingText(const QTextCursor &tc) { QTextDocument *doc = tc.document(); return shouldInsertMatchingText(doc->characterAt(tc.selectionEnd())); } +namespace { + class FindIdDeclarations: protected Visitor { public: @@ -938,7 +938,7 @@ QString QmlJSTextEditor::wordUnderCursor() const return word; } -bool QmlJSTextEditor::isElectricCharacter(const QChar &ch) const +bool QmlJSTextEditor::isElectricCharacter(QChar ch) const { if (ch == QLatin1Char('}') || ch == QLatin1Char(']') @@ -1177,7 +1177,7 @@ bool QmlJSTextEditor::isInComment(const QTextCursor &) const return false; } -QString QmlJSTextEditor::insertMatchingBrace(const QTextCursor &tc, const QString &text, const QChar &, int *skippedChars) const +QString QmlJSTextEditor::insertMatchingBrace(const QTextCursor &tc, const QString &text, QChar, int *skippedChars) const { if (text.length() != 1) return QString(); diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h index 1fb222e51b5..cb1edfcf28d 100644 --- a/src/plugins/qmljseditor/qmljseditor.h +++ b/src/plugins/qmljseditor/qmljseditor.h @@ -246,11 +246,11 @@ protected: //// brace matching virtual bool contextAllowsAutoParentheses(const QTextCursor &cursor, const QString &textToInsert = QString()) const; virtual bool isInComment(const QTextCursor &cursor) const; - virtual QString insertMatchingBrace(const QTextCursor &tc, const QString &text, const QChar &la, int *skippedChars) const; + virtual QString insertMatchingBrace(const QTextCursor &tc, const QString &text, QChar la, int *skippedChars) const; virtual QString insertParagraphSeparator(const QTextCursor &tc) const; private: - virtual bool isElectricCharacter(const QChar &ch) const; + virtual bool isElectricCharacter(QChar ch) const; virtual void indentBlock(QTextDocument *doc, QTextBlock block, QChar typedChar); bool isClosingBrace(const QList &tokens) const; diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 62eb14e2153..90858bb4d59 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -3806,7 +3806,7 @@ void BaseTextEditor::zoomReset() emit requestZoomReset(); } -bool BaseTextEditor::isElectricCharacter(const QChar &) const +bool BaseTextEditor::isElectricCharacter(QChar) const { return false; } @@ -3863,7 +3863,7 @@ bool BaseTextEditor::isInComment(const QTextCursor &cursor) const } QString BaseTextEditor::insertMatchingBrace(const QTextCursor &tc, const QString &text, - const QChar &la, int *skippedChars) const + QChar la, int *skippedChars) const { Q_UNUSED(tc); Q_UNUSED(text); diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h index 294cd3033fa..066ec0d8a08 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/basetexteditor.h @@ -384,7 +384,7 @@ protected: public: // Returns true if key triggers an indent. - virtual bool isElectricCharacter(const QChar &ch) const; + virtual bool isElectricCharacter(QChar ch) const; void indentInsertedText(const QTextCursor &tc); @@ -407,7 +407,7 @@ protected: // Returns true if the cursor is inside a comment. virtual bool isInComment(const QTextCursor &cursor) const; - virtual QString insertMatchingBrace(const QTextCursor &tc, const QString &text, const QChar &la, int *skippedChars) const; + virtual QString insertMatchingBrace(const QTextCursor &tc, const QString &text, QChar la, int *skippedChars) const; // Returns the text that needs to be inserted virtual QString insertParagraphSeparator(const QTextCursor &tc) const; diff --git a/src/shared/proparser/ioutils.cpp b/src/shared/proparser/ioutils.cpp index 5ed9ea50220..028d4cb6dda 100644 --- a/src/shared/proparser/ioutils.cpp +++ b/src/shared/proparser/ioutils.cpp @@ -176,7 +176,7 @@ QString IoUtils::shellQuote(const QString &arg) #else // Q_OS_WIN -inline static bool isSpecial(const QChar &cUnicode) +inline static bool isSpecial(QChar cUnicode) { static const uchar iqm[] = { 0xff, 0xff, 0xff, 0xff, 0xdf, 0x07, 0x00, 0xd8,