diff options
Diffstat (limited to 'src/plugins/cppeditor/cppeditor.cpp')
| -rw-r--r-- | src/plugins/cppeditor/cppeditor.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 7d153fc5ce..62cf921069 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -176,11 +176,6 @@ struct CanonicalSymbol return typeOfExpression.context(); } - static inline bool isIdentifierChar(const QChar &ch) - { - return ch.isLetterOrNumber() || ch == QLatin1Char('_'); - } - Scope *getScopeAndExpression(const QTextCursor &cursor, QString *code) { return getScopeAndExpression(editor, info, cursor, code); @@ -202,11 +197,11 @@ struct CanonicalSymbol int pos = tc.position(); - if (!isIdentifierChar(document->characterAt(pos))) - if (!(pos > 0 && isIdentifierChar(document->characterAt(pos - 1)))) + if (!isValidIdentifierChar(document->characterAt(pos))) + if (!(pos > 0 && isValidIdentifierChar(document->characterAt(pos - 1)))) return 0; - while (isIdentifierChar(document->characterAt(pos))) + while (isValidIdentifierChar(document->characterAt(pos))) ++pos; tc.setPosition(pos); |