Merge branch 'origin/2.0' (early part)

[qt-creator-jp/qt-creator-jp.git] / src / plugins / qmljseditor / qmljseditor.h

diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index 5ea672d..486170c 100644 (file)
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -249,11 +249,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<QmlJS::Token> &tokens) const;