From 41aa2cb3bdd247898b32941270838ec6348cd755 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 12 Dec 2013 21:37:46 +0100 Subject: C++: Use Token::utf16chars{Begin,End} where appropriate ...especially in CppTools/CppEditor where the offsets are used with a QString/QTextDocument. Change-Id: Ic6d18fbc01fb9cc899a9bd2d7424cd2edae487f1 Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cpprefactoringchanges.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/cpptools/cpprefactoringchanges.cpp') diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp index 4ea1ed54772..a44bdadb2ef 100644 --- a/src/plugins/cpptools/cpprefactoringchanges.cpp +++ b/src/plugins/cpptools/cpprefactoringchanges.cpp @@ -201,7 +201,7 @@ ChangeSet::Range CppRefactoringFile::range(unsigned tokenIndex) const unsigned line, column; cppDocument()->translationUnit()->getPosition(token.utf16charsBegin(), &line, &column); const int start = document()->findBlockByNumber(line - 1).position() + column - 1; - return ChangeSet::Range(start, start + token.bytes()); + return ChangeSet::Range(start, start + token.utf16chars()); } ChangeSet::Range CppRefactoringFile::range(AST *ast) const @@ -241,7 +241,7 @@ void CppRefactoringFile::startAndEndOf(unsigned index, int *start, int *end) con Token token(tokenAt(index)); cppDocument()->translationUnit()->getPosition(token.utf16charsBegin(), &line, &column); *start = document()->findBlockByNumber(line - 1).position() + column - 1; - *end = *start + token.bytes(); + *end = *start + token.utf16chars(); } QString CppRefactoringFile::textOf(const AST *ast) const -- cgit v1.2.3