From 286f863f5db97923c5ae3c1da8bcde55b46023f5 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 26 Feb 2015 09:17:28 +0200 Subject: [PATCH] CppTools: Use correct language features in createHighlighter Change-Id: Ia8971dbc9be18575a1b22d46dac5bb8c18c63c7a Reviewed-by: Nikolai Kosjar --- .../cpptools/builtineditordocumentprocessor.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp index 184563837d7..59f0ff7c171 100644 --- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp +++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp @@ -78,23 +78,20 @@ CppTools::CheckSymbols *createHighlighter(const CPlusPlus::Document::Ptr &doc, macroUses.append(use); } + const LanguageFeatures features = doc->languageFeatures(); + // Get macro uses foreach (const Document::MacroUse ¯o, doc->macroUses()) { const QString name = macro.macro().nameToQString(); //Filter out QtKeywords - if (isQtKeyword(QStringRef(&name))) + if (features.qtKeywordsEnabled && isQtKeyword(QStringRef(&name))) continue; - // Filter out C++ keywords - // FIXME: Check default values or get from document. - LanguageFeatures features; - features.cxx11Enabled = true; - features.c99Enabled = true; - SimpleLexer tokenize; tokenize.setLanguageFeatures(features); + // Filter out C++ keywords const Tokens tokens = tokenize(name); if (tokens.length() && (tokens.at(0).isKeyword() || tokens.at(0).isObjCAtKeyword())) continue;