diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-02-26 09:15:34 +0200 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2015-02-28 16:56:14 +0000 |
commit | 69edf1e26d248fabf05bb0a43d32e34a0fcee121 (patch) | |
tree | 65572e983b1d43d5e278bf4899ef51ed8edd2680 /src/libs/cplusplus/SimpleLexer.cpp | |
parent | 88ee2bfb641c17ea5ad942558c9c9d40eb118a04 (diff) | |
download | qt-creator-69edf1e26d248fabf05bb0a43d32e34a0fcee121.tar.gz |
CppEditor: Use correct language features in Follow Symbol
Change-Id: If4adc4153341ac63bd5566a66ccf177ae4e536e1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src/libs/cplusplus/SimpleLexer.cpp')
-rw-r--r-- | src/libs/cplusplus/SimpleLexer.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp index ff2a5f6468..373441198c 100644 --- a/src/libs/cplusplus/SimpleLexer.cpp +++ b/src/libs/cplusplus/SimpleLexer.cpp @@ -129,17 +129,10 @@ int SimpleLexer::tokenAt(const Tokens &tokens, unsigned utf16charsOffset) Token SimpleLexer::tokenAt(const QString &text, unsigned utf16charsOffset, int state, - bool qtMocRunEnabled) + const LanguageFeatures &languageFeatures) { - // FIXME: Check default values. - LanguageFeatures features; - features.qtMocRunEnabled = qtMocRunEnabled; - features.qtEnabled = qtMocRunEnabled; - features.qtKeywordsEnabled = qtMocRunEnabled; - features.objCEnabled = qtMocRunEnabled; - features.cxx11Enabled = qtMocRunEnabled; SimpleLexer tokenize; - tokenize.setLanguageFeatures(features); + tokenize.setLanguageFeatures(languageFeatures); const QVector<Token> tokens = tokenize(text, state); const int tokenIdx = tokenAt(tokens, utf16charsOffset); return (tokenIdx == -1) ? Token() : tokens.at(tokenIdx); |