From ca151d07fa6d97039fed95dcabe206fce41f5769 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 6 Nov 2014 09:35:29 +0100 Subject: CPlusPlus: Use QVector instead of QList Better suited to avoid the indirection (sizeof(Token) > sizeof(void *)) Change-Id: Ia5f42781e720ef6aa8161f8f81ae8ddd8e58c837 Reviewed-by: Nikolai Kosjar --- src/libs/cplusplus/SimpleLexer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libs/cplusplus/SimpleLexer.cpp') diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp index cec749eba0..db76bb4c09 100644 --- a/src/libs/cplusplus/SimpleLexer.cpp +++ b/src/libs/cplusplus/SimpleLexer.cpp @@ -62,9 +62,9 @@ bool SimpleLexer::endedJoined() const return _endedJoined; } -QList SimpleLexer::operator()(const QString &text, int state) +Tokens SimpleLexer::operator()(const QString &text, int state) { - QList tokens; + Tokens tokens; const QByteArray bytes = text.toUtf8(); const char *firstChar = bytes.constData(); @@ -113,7 +113,7 @@ QList SimpleLexer::operator()(const QString &text, int state) return tokens; } -int SimpleLexer::tokenAt(const QList &tokens, unsigned utf16charsOffset) +int SimpleLexer::tokenAt(const Tokens &tokens, unsigned utf16charsOffset) { for (int index = tokens.size() - 1; index >= 0; --index) { const Token &tk = tokens.at(index); @@ -138,12 +138,12 @@ Token SimpleLexer::tokenAt(const QString &text, features.cxx11Enabled = qtMocRunEnabled; SimpleLexer tokenize; tokenize.setLanguageFeatures(features); - const QList tokens = tokenize(text, state); + const QVector tokens = tokenize(text, state); const int tokenIdx = tokenAt(tokens, utf16charsOffset); return (tokenIdx == -1) ? Token() : tokens.at(tokenIdx); } -int SimpleLexer::tokenBefore(const QList &tokens, unsigned utf16charsOffset) +int SimpleLexer::tokenBefore(const Tokens &tokens, unsigned utf16charsOffset) { for (int index = tokens.size() - 1; index >= 0; --index) { const Token &tk = tokens.at(index); -- cgit v1.2.1