diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-05-05 11:43:24 -0400 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-05-23 14:24:23 +0200 |
| commit | bea8fc8e6a9dc71110a90affc34361e96714631f (patch) | |
| tree | 43a686e82f73f71b1f05d81eb655d2afb3db36c1 /src/plugins/cpptools/cpplocalsymbols.cpp | |
| parent | cadc4b42bacf959258f7d4b19e93d02c02b63449 (diff) | |
| download | qt-creator-bea8fc8e6a9dc71110a90affc34361e96714631f.tar.gz | |
Cpp{Tools,Editor}: Expect UTF-8 encoded literals
Change-Id: I9843c4163aad3fa3f1bfa33060c76328fc2dc25a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpplocalsymbols.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpplocalsymbols.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/cpptools/cpplocalsymbols.cpp b/src/plugins/cpptools/cpplocalsymbols.cpp index 4e795cdf08..a6eac214a6 100644 --- a/src/plugins/cpptools/cpplocalsymbols.cpp +++ b/src/plugins/cpptools/cpplocalsymbols.cpp @@ -86,11 +86,11 @@ protected: continue; if (!member->isGenerated() && (member->isDeclaration() || member->isArgument())) { if (member->name() && member->name()->isNameId()) { - const Identifier *id = member->identifier(); + const Token token = tokenAt(member->sourceLocation()); unsigned line, column; - getTokenStartPosition(member->sourceLocation(), &line, &column); + getPosition(token.utf16charsBegin(), &line, &column); localUses[member].append( - HighlightingResult(line, column, id->size(), + HighlightingResult(line, column, token.utf16chars(), CppHighlightingSupport::LocalUse)); } } @@ -101,7 +101,8 @@ protected: bool checkLocalUse(NameAST *nameAst, unsigned firstToken) { if (SimpleNameAST *simpleName = nameAst->asSimpleName()) { - if (tokenAt(simpleName->identifier_token).generated()) + const Token token = tokenAt(simpleName->identifier_token); + if (token.generated()) return false; const Identifier *id = identifier(simpleName->identifier_token); for (int i = _scopeStack.size() - 1; i != -1; --i) { @@ -113,7 +114,7 @@ protected: unsigned line, column; getTokenStartPosition(simpleName->identifier_token, &line, &column); localUses[member].append( - HighlightingResult(line, column, id->size(), + HighlightingResult(line, column, token.utf16chars(), CppHighlightingSupport::LocalUse)); return false; } |