summaryrefslogtreecommitdiff
path: root/src/plugins/clangcodemodel/clangcompletion.cpp
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-11-06 09:35:29 +0100
committerhjk <hjk121@nokiamail.com>2014-11-06 16:13:58 +0100
commitca151d07fa6d97039fed95dcabe206fce41f5769 (patch)
tree77b2e92a9fc01a074d3debdb0300d28337b8cf19 /src/plugins/clangcodemodel/clangcompletion.cpp
parentcb1d040c327f5c8ed8a188e6227ef0e131a3271b (diff)
downloadqt-creator-ca151d07fa6d97039fed95dcabe206fce41f5769.tar.gz
CPlusPlus: Use QVector<Token> instead of QList
Better suited to avoid the indirection (sizeof(Token) > sizeof(void *)) Change-Id: Ia5f42781e720ef6aa8161f8f81ae8ddd8e58c837 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src/plugins/clangcodemodel/clangcompletion.cpp')
-rw-r--r--src/plugins/clangcodemodel/clangcompletion.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp
index d6019fb687..3f37f2747c 100644
--- a/src/plugins/clangcodemodel/clangcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangcompletion.cpp
@@ -321,7 +321,7 @@ int ClangFunctionHintModel::activeArgument(const QString &prefix) const
int argnr = 0;
int parcount = 0;
SimpleLexer tokenize;
- QList<CPlusPlus::Token> tokens = tokenize(prefix);
+ Tokens tokens = tokenize(prefix);
for (int i = 0; i < tokens.count(); ++i) {
const CPlusPlus::Token &tk = tokens.at(i);
if (tk.is(T_LPAREN))
@@ -747,7 +747,7 @@ int ClangCompletionAssistProcessor::startOfOperator(int pos,
lf.objCEnabled = true;
tokenize.setLanguageFeatures(lf);
tokenize.setSkipComments(false);
- const QList<CPlusPlus::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 CPlusPlus::Token tk = (tokenIdx == -1) ? CPlusPlus::Token() : tokens.at(tokenIdx);
@@ -858,7 +858,7 @@ bool ClangCompletionAssistProcessor::accepts() const
lf.objCEnabled = true;
tokenize.setLanguageFeatures(lf);
tokenize.setSkipComments(false);
- const QList<CPlusPlus::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 CPlusPlus::Token tk = (tokenIdx == -1) ? CPlusPlus::Token() : tokens.at(tokenIdx);