feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: Use Token::utf16chars{Begin,End} where appropriate

Browse Source 
...especially in CppTools/CppEditor where the offsets are used with a
QString/QTextDocument.

Change-Id: Ic6d18fbc01fb9cc899a9bd2d7424cd2edae487f1
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-12-12 21:37:46 +01:00
parent 57ff992961
commit 41aa2cb3bd
19 changed files with 103 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cppeditor/cppfunctiondecldeflink.cpp
View File

@@ -414,17 +414,17 @@ static bool hasCommentedName(
// maybe in a comment but in the right spot?
int nameStart = 0;
if (param->declarator)
nameStart = unit->tokenAt(param->declarator->lastToken() - 1).bytesEnd();
nameStart = unit->tokenAt(param->declarator->lastToken() - 1).utf16charsEnd();
else if (param->type_specifier_list)
nameStart = unit->tokenAt(param->type_specifier_list->lastToken() - 1).bytesEnd();
nameStart = unit->tokenAt(param->type_specifier_list->lastToken() - 1).utf16charsEnd();
else
nameStart = unit->tokenAt(param->firstToken()).bytesBegin();
nameStart = unit->tokenAt(param->firstToken()).utf16charsBegin();
int nameEnd = 0;
if (param->equal_token)
nameEnd = unit->tokenAt(param->equal_token).bytesBegin();
nameEnd = unit->tokenAt(param->equal_token).utf16charsBegin();
else
nameEnd = unit->tokenAt(param->lastToken()).bytesBegin(); // one token after
nameEnd = unit->tokenAt(param->lastToken()).utf16charsBegin(); // one token after
QString text = source.mid(nameStart, nameEnd - nameStart);