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

CPlusPlus: Use QVector<Token> instead of QList

Browse Source 
Better suited to avoid the indirection (sizeof(Token) > sizeof(void *))

Change-Id: Ia5f42781e720ef6aa8161f8f81ae8ddd8e58c837
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
hjk
2014-11-06 09:35:29 +01:00
parent cb1d040c32
commit ca151d07fa
13 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cpptools/cppcompletionassist.cpp
View File

@@ -387,7 +387,7 @@ int CppFunctionHintModel::activeArgument(const QString &prefix) const
int argnr = 0;
int parcount = 0;
SimpleLexer tokenize;
QList<Token> tokens = tokenize(prefix);
Tokens tokens = tokenize(prefix);
for (int i = 0; i < tokens.count(); ++i) {
const Token &tk = tokens.at(i);
if (tk.is(T_LPAREN))
@@ -686,7 +686,7 @@ bool CppCompletionAssistProcessor::accepts() const
tokenize.setLanguageFeatures(features);
tokenize.setSkipComments(false);
const QList<Token> &tokens = tokenize(tc.block().text(), BackwardsScanner::previousBlockState(tc.block()));
const Tokens &tokens = tokenize(tc.block().text(), BackwardsScanner::previousBlockState(tc.block()));
const int tokenIdx = SimpleLexer::tokenBefore(tokens, qMax(0, tc.positionInBlock() - 1));
const Token tk = (tokenIdx == -1) ? Token() : tokens.at(tokenIdx);
@@ -789,7 +789,7 @@ int CppCompletionAssistProcessor::startOfOperator(int pos,
SimpleLexer tokenize;
tokenize.setLanguageFeatures(m_languageFeatures);
tokenize.setSkipComments(false);
const QList<Token> &tokens = tokenize(tc.block().text(), BackwardsScanner::previousBlockState(tc.block()));
const Tokens &tokens = tokenize(tc.block().text(), BackwardsScanner::previousBlockState(tc.block()));
const int tokenIdx = SimpleLexer::tokenBefore(tokens, qMax(0, tc.positionInBlock() - 1)); // get the token at the left of the cursor
const Token tk = (tokenIdx == -1) ? Token() : tokens.at(tokenIdx);