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

12
src/plugins/cpptools/cppcodeformatter.cpp
View File

@@ -1012,7 +1012,7 @@ int CodeFormatter::column(int index) const
QStringRef CodeFormatter::currentTokenText() const
{
return m_currentLine.midRef(m_currentToken.bytesBegin(), m_currentToken.bytes());
return m_currentLine.midRef(m_currentToken.utf16charsBegin(), m_currentToken.utf16chars());
}
void CodeFormatter::turnInto(int newState)
@@ -1189,10 +1189,10 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
const Token &tk = currentToken();
const bool firstToken = (tokenIndex() == 0);
const bool lastToken = (tokenIndex() == tokenCount() - 1);
const int tokenPosition = column(tk.bytesBegin());
const int nextTokenPosition = lastToken ? tokenPosition + tk.bytes()
: column(tokenAt(tokenIndex() + 1).bytesBegin());
const int spaceOrNextTokenPosition = lastToken ? tokenPosition + tk.bytes() + 1
const int tokenPosition = column(tk.utf16charsBegin());
const int nextTokenPosition = lastToken ? tokenPosition + tk.utf16chars()
: column(tokenAt(tokenIndex() + 1).utf16charsBegin());
const int spaceOrNextTokenPosition = lastToken ? tokenPosition + tk.utf16chars() + 1
: nextTokenPosition;
if (shouldClearPaddingOnEnter(newState))
@@ -1474,7 +1474,7 @@ void QtStyleCodeFormatter::adjustIndent(const QList<CPlusPlus::Token> &tokens, i
case multiline_comment_start:
case multiline_comment_cont:
if (!tokens.isEmpty()) {
*indentDepth = column(tokens.at(0).bytesBegin());
*indentDepth = column(tokens.at(0).utf16charsBegin());
return;
}
break;