diff options
author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-06-29 17:57:15 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-07-02 11:18:51 +0200 |
commit | 8e4fb678fd68cbb01d5548ba07dfcb2927868df4 (patch) | |
tree | 8d2a8d2dd7c31a3bfa0d98b28f2cb7589e18ecc5 /src/libs/cplusplus/ExpressionUnderCursor.cpp | |
parent | e3e8b1a5c01ddc230772ee0553ca325704295312 (diff) | |
download | qt-creator-8e4fb678fd68cbb01d5548ba07dfcb2927868df4.tar.gz |
Removing SimpleToken
Diffstat (limited to 'src/libs/cplusplus/ExpressionUnderCursor.cpp')
-rw-r--r-- | src/libs/cplusplus/ExpressionUnderCursor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/cplusplus/ExpressionUnderCursor.cpp b/src/libs/cplusplus/ExpressionUnderCursor.cpp index c840ad398d..d70bf3428e 100644 --- a/src/libs/cplusplus/ExpressionUnderCursor.cpp +++ b/src/libs/cplusplus/ExpressionUnderCursor.cpp @@ -56,7 +56,7 @@ int ExpressionUnderCursor::startOfExpression(BackwardsScanner &tk, int index) index = startOfExpression_helper(tk, index); if (_jumpedComma) { - const SimpleToken &tok = tk[index - 1]; + const Token &tok = tk[index - 1]; switch (tok.kind()) { case T_COMMA: @@ -204,7 +204,7 @@ int ExpressionUnderCursor::startOfExpression_helper(BackwardsScanner &tk, int in return index; } -bool ExpressionUnderCursor::isAccessToken(const SimpleToken &tk) +bool ExpressionUnderCursor::isAccessToken(const Token &tk) { switch (tk.kind()) { case T_COLON_COLON: @@ -237,12 +237,12 @@ int ExpressionUnderCursor::startOfFunctionCall(const QTextCursor &cursor) const int index = scanner.startToken(); forever { - const SimpleToken &tk = scanner[index - 1]; + const Token &tk = scanner[index - 1]; if (tk.is(T_EOF_SYMBOL)) break; else if (tk.is(T_LPAREN)) - return scanner.startPosition() + tk.position(); + return scanner.startPosition() + tk.begin(); else if (tk.is(T_RPAREN)) { int matchingBrace = scanner.startOfMatchingBrace(index); |