C++: highlighter clean-ups

- Moved TextEditor::SemanticHighlighter::Result to TextEditor::HighlightingResult - Moved SemanticInfo::UseKind to CppHighlightingSupport::Kind Change-Id: I14faab1891ca691a0691cfd9243edf19fcd3d3df Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
author: Erik Verbruggen <erik.verbruggen@digia.com> 2013-04-16 16:48:10 +0200
committer: Erik Verbruggen <erik.verbruggen@digia.com> 2013-04-18 12:25:24 +0200
commit: 4b0f70f4c9d52574edc80dbff441a2a5fa1a7f80 (patch)
tree: 41ae389add1d6cb415a3ca7ebe47e6e64add4629
parent: 6a4310a44afc0396b462f9ac9f3524161155645a (diff)
download: qt-creator-4b0f70f4c9d52574edc80dbff441a2a5fa1a7f80.tar.gz
13 files changed, 797 insertions, 785 deletions
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 2c9868e470..9aba0edd3b 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -1949,23 +1949,24 @@ void CPPEditorWidget::setFontSettings(const TextEditor::FontSettings &fs)
     m_occurrencesUnusedFormat.clearForeground();
     m_occurrencesUnusedFormat.setToolTip(tr("Unused variable"));
     m_occurrenceRenameFormat = fs.toTextCharFormat(TextEditor::C_OCCURRENCES_RENAME);
-    m_semanticHighlightFormatMap[SemanticInfo::TypeUse] =
+
+    m_semanticHighlightFormatMap[CppHighlightingSupport::TypeUse] =
             fs.toTextCharFormat(TextEditor::C_TYPE);
-    m_semanticHighlightFormatMap[SemanticInfo::LocalUse] =
+    m_semanticHighlightFormatMap[CppHighlightingSupport::LocalUse] =
             fs.toTextCharFormat(TextEditor::C_LOCAL);
-    m_semanticHighlightFormatMap[SemanticInfo::FieldUse] =
+    m_semanticHighlightFormatMap[CppHighlightingSupport::FieldUse] =
             fs.toTextCharFormat(TextEditor::C_FIELD);
-    m_semanticHighlightFormatMap[SemanticInfo::EnumerationUse] =
+    m_semanticHighlightFormatMap[CppHighlightingSupport::EnumerationUse] =
             fs.toTextCharFormat(TextEditor::C_ENUMERATION);
-    m_semanticHighlightFormatMap[SemanticInfo::VirtualMethodUse] =
+    m_semanticHighlightFormatMap[CppHighlightingSupport::VirtualMethodUse] =
             fs.toTextCharFormat(TextEditor::C_VIRTUAL_METHOD);
-    m_semanticHighlightFormatMap[SemanticInfo::LabelUse] =
+    m_semanticHighlightFormatMap[CppHighlightingSupport::LabelUse] =
             fs.toTextCharFormat(TextEditor::C_LABEL);
-    m_semanticHighlightFormatMap[SemanticInfo::MacroUse] =
+    m_semanticHighlightFormatMap[CppHighlightingSupport::MacroUse] =
             fs.toTextCharFormat(TextEditor::C_PREPROCESSOR);
-    m_semanticHighlightFormatMap[SemanticInfo::FunctionUse] =
+    m_semanticHighlightFormatMap[CppHighlightingSupport::FunctionUse] =
             fs.toTextCharFormat(TextEditor::C_FUNCTION);
-    m_semanticHighlightFormatMap[SemanticInfo::PseudoKeywordUse] =
+    m_semanticHighlightFormatMap[CppHighlightingSupport::PseudoKeywordUse] =
             fs.toTextCharFormat(TextEditor::C_KEYWORD);
     m_keywordFormat = fs.toTextCharFormat(TextEditor::C_KEYWORD);
 
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index 634d3d4538..20c4ef7f61 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -260,7 +260,7 @@ private:
 
     SemanticHighlighter::Source currentSource(bool force = false);
 
-    void highlightUses(const QList<TextEditor::SemanticHighlighter::Result> &uses,
+    void highlightUses(const QList<TextEditor::HighlightingResult> &uses,
                        QList<QTextEdit::ExtraSelection> *selections);
 
     void createToolBar(CPPEditor *editable);
@@ -316,8 +316,8 @@ private:
     bool m_objcEnabled;
     bool m_initialized;
 
-    QFuture<TextEditor::SemanticHighlighter::Result> m_highlighter;
-    QFutureWatcher<TextEditor::SemanticHighlighter::Result> m_highlightWatcher;
+    QFuture<TextEditor::HighlightingResult> m_highlighter;
+    QFutureWatcher<TextEditor::HighlightingResult> m_highlightWatcher;
     unsigned m_highlightRevision; // the editor revision that requested the highlight
 
     QFuture<QList<int> > m_references;
diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp
index 2b48ae1e11..dfba5f9c99 100644
--- a/src/plugins/cpptools/cppchecksymbols.cpp
+++ b/src/plugins/cpptools/cppchecksymbols.cpp
@@ -270,7 +270,7 @@ protected:
 
 } // end of anonymous namespace
 
-static bool sortByLinePredicate(const CheckSymbols::Use &lhs, const CheckSymbols::Use &rhs)
+static bool sortByLinePredicate(const CheckSymbols::Result &lhs, const CheckSymbols::Result &rhs)
 {
     if (lhs.line == rhs.line)
         return lhs.column < rhs.column;
@@ -294,25 +294,17 @@ static bool acceptName(NameAST *ast, unsigned *referenceToken)
             && !ast->asOperatorFunctionId();
 }
 
-CheckSymbols::Future CheckSymbols::go(Document::Ptr doc, const LookupContext &context, const QList<CheckSymbols::Use> &macroUses)
+CheckSymbols::Future CheckSymbols::go(Document::Ptr doc, const LookupContext &context, const QList<CheckSymbols::Result> &macroUses)
 {
     QTC_ASSERT(doc, return Future());
 
     return (new CheckSymbols(doc, context, macroUses))->start();
 }
 
-CheckSymbols::CheckSymbols(Document::Ptr doc, const LookupContext &context, const QList<CheckSymbols::Use> &macroUses)
+CheckSymbols::CheckSymbols(Document::Ptr doc, const LookupContext &context, const QList<CheckSymbols::Result> &macroUses)
     : ASTVisitor(doc->translationUnit()), _doc(doc), _context(context)
     , _lineOfLastUsage(0), _macroUses(macroUses)
 {
-    CollectSymbols collectTypes(doc, context.snapshot());
-
-    _fileName = doc->fileName();
-    _potentialTypes = collectTypes.types();
-    _potentialFields = collectTypes.fields();
-    _potentialFunctions = collectTypes.functions();
-    _potentialStatics = collectTypes.statics();
-
     unsigned line = 0;
     getTokenEndPosition(translationUnit()->ast()->lastToken(), &line, 0);
     _chunkSize = qMax(50U, line / 200);
@@ -330,13 +322,21 @@ CheckSymbols::~CheckSymbols()
 
 void CheckSymbols::run()
 {
+    CollectSymbols collectTypes(_doc, _context.snapshot());
+
+    _fileName = _doc->fileName();
+    _potentialTypes = collectTypes.types();
+    _potentialFields = collectTypes.fields();
+    _potentialFunctions = collectTypes.functions();
+    _potentialStatics = collectTypes.statics();
+
     qSort(_macroUses.begin(), _macroUses.end(), sortByLinePredicate);
     _doc->clearDiagnosticMessages();
 
     if (! isCanceled()) {
         if (_doc->translationUnit()) {
             accept(_doc->translationUnit()->ast());
-            _usages << QVector<Use>::fromList(_macroUses);
+            _usages << QVector<Result>::fromList(_macroUses);
             flush();
         }
     }
@@ -468,7 +468,7 @@ bool CheckSymbols::visit(NamespaceAST *ast)
         if (! tok.generated()) {
             unsigned line, column;
             getTokenStartPosition(ast->identifier_token, &line, &column);
-            Use use(line, column, tok.length(), SemanticInfo::TypeUse);
+            Result use(line, column, tok.length(), CppHighlightingSupport::TypeUse);
             addUse(use);
         }
     }
@@ -483,7 +483,7 @@ bool CheckSymbols::visit(UsingDirectiveAST *)
 
 bool CheckSymbols::visit(EnumeratorAST *ast)
 {
-    addUse(ast->identifier_token, SemanticInfo::EnumerationUse);
+    addUse(ast->identifier_token, CppHighlightingSupport::EnumerationUse);
     return true;
 }
 
@@ -498,7 +498,7 @@ bool CheckSymbols::visit(SimpleDeclarationAST *ast)
                     if (funTy->isVirtual()
                             || (nameAST->asDestructorName()
                                 && hasVirtualDestructor(_context.lookupType(funTy->enclosingScope())))) {
-                        addUse(nameAST, SemanticInfo::VirtualMethodUse);
+                        addUse(nameAST, CppHighlightingSupport::VirtualMethodUse);
                         declrIdNameAST = nameAST;
                     } else if (maybeAddFunction(_context.lookup(decl->name(),
                                                                 decl->enclosingScope()),
@@ -506,7 +506,7 @@ bool CheckSymbols::visit(SimpleDeclarationAST *ast)
                         declrIdNameAST = nameAST;
 
                         // Add a diagnostic message if non-virtual function has override/final marker
-                        if ((_usages.back().kind != SemanticInfo::VirtualMethodUse)) {
+                        if ((_usages.back().kind != CppHighlightingSupport::VirtualMethodUse)) {
                             if (funTy->isOverride())
                                 warning(declrIdNameAST, QCoreApplication::translate(
                                             "CPlusplus::CheckSymbols", "Only virtual methods can be marked 'override'"));
@@ -544,7 +544,7 @@ bool CheckSymbols::visit(ElaboratedTypeSpecifierAST *ast)
 {
     accept(ast->attribute_list);
     accept(ast->name);
-    addUse(ast->name, SemanticInfo::TypeUse);
+    addUse(ast->name, CppHighlightingSupport::TypeUse);
     return false;
 }
 
@@ -777,14 +777,14 @@ void CheckSymbols::checkName(NameAST *ast, Scope *scope)
 
             if (klass) {
                 if (hasVirtualDestructor(_context.lookupType(klass))) {
-                    addUse(ast, SemanticInfo::VirtualMethodUse);
+                    addUse(ast, CppHighlightingSupport::VirtualMethodUse);
                 } else {
                     bool added = false;
                     if (highlightCtorDtorAsType && maybeType(ast->name))
                         added = maybeAddTypeOrStatic(_context.lookup(ast->name, klass), ast);
 
                     if (!added)
-                        addUse(ast, SemanticInfo::FunctionUse);
+                        addUse(ast, CppHighlightingSupport::FunctionUse);
                 }
             }
         } else if (maybeType(ast->name) || maybeStatic(ast->name)) {
@@ -834,14 +834,14 @@ bool CheckSymbols::visit(QualifiedNameAST *ast)
         if (binding && ast->unqualified_name) {
             if (ast->unqualified_name->asDestructorName() != 0) {
                 if (hasVirtualDestructor(binding)) {
-                    addUse(ast->unqualified_name, SemanticInfo::VirtualMethodUse);
+                    addUse(ast->unqualified_name, CppHighlightingSupport::VirtualMethodUse);
                 } else {
                     bool added = false;
                     if (highlightCtorDtorAsType && maybeType(ast->name))
                         added = maybeAddTypeOrStatic(binding->find(ast->unqualified_name->name),
                                                      ast->unqualified_name);
                     if (!added)
-                        addUse(ast->unqualified_name, SemanticInfo::FunctionUse);
+                        addUse(ast->unqualified_name, CppHighlightingSupport::FunctionUse);
                 }
             } else {
                 maybeAddTypeOrStatic(binding->find(ast->unqualified_name->name), ast->unqualified_name);
@@ -877,7 +877,7 @@ ClassOrNamespace *CheckSymbols::checkNestedName(QualifiedNameAST *ast)
                     if (NameAST *class_or_namespace_name = nested_name_specifier->class_or_namespace_name) {
                         if (TemplateIdAST *template_id = class_or_namespace_name->asTemplateId()) {
                             if (template_id->template_token) {
-                                addUse(template_id, SemanticInfo::TypeUse);
+                                addUse(template_id, CppHighlightingSupport::TypeUse);
                                 binding = 0; // there's no way we can find a binding.
                             }
 
@@ -901,7 +901,7 @@ ClassOrNamespace *CheckSymbols::checkNestedName(QualifiedNameAST *ast)
 
 bool CheckSymbols::visit(TypenameTypeParameterAST *ast)
 {
-    addUse(ast->name, SemanticInfo::TypeUse);
+    addUse(ast->name, CppHighlightingSupport::TypeUse);
     accept(ast->type_id);
     return false;
 }
@@ -909,7 +909,7 @@ bool CheckSymbols::visit(TypenameTypeParameterAST *ast)
 bool CheckSymbols::visit(TemplateTypeParameterAST *ast)
 {
     accept(ast->template_parameter_list);
-    addUse(ast->name, SemanticInfo::TypeUse);
+    addUse(ast->name, CppHighlightingSupport::TypeUse);
     accept(ast->type_id);
     return false;
 }
@@ -961,7 +961,7 @@ bool CheckSymbols::visit(MemInitializerAST *ast)
 bool CheckSymbols::visit(GotoStatementAST *ast)
 {
     if (ast->identifier_token)
-        addUse(ast->identifier_token, SemanticInfo::LabelUse);
+        addUse(ast->identifier_token, CppHighlightingSupport::LabelUse);
 
     return false;
 }
@@ -969,7 +969,7 @@ bool CheckSymbols::visit(GotoStatementAST *ast)
 bool CheckSymbols::visit(LabeledStatementAST *ast)
 {
     if (ast->label_token && !tokenAt(ast->label_token).isKeyword())
-        addUse(ast->label_token, SemanticInfo::LabelUse);
+        addUse(ast->label_token, CppHighlightingSupport::LabelUse);
 
     accept(ast->statement);
     return false;
@@ -990,7 +990,7 @@ bool CheckSymbols::visit(SimpleSpecifierAST *ast)
             if (id.equalTo(_doc->control()->cpp11Override())
                     || id.equalTo(_doc->control()->cpp11Final()))
             {
-                addUse(ast->specifier_token, SemanticInfo::PseudoKeywordUse);
+                addUse(ast->specifier_token, CppHighlightingSupport::PseudoKeywordUse);
             }
         }
     }
@@ -1001,7 +1001,7 @@ bool CheckSymbols::visit(SimpleSpecifierAST *ast)
 bool CheckSymbols::visit(ClassSpecifierAST *ast)
 {
     if (ast->final_token)
-        addUse(ast->final_token, SemanticInfo::PseudoKeywordUse);
+        addUse(ast->final_token, CppHighlightingSupport::PseudoKeywordUse);
 
     return true;
 }
@@ -1026,7 +1026,7 @@ bool CheckSymbols::visit(FunctionDefinitionAST *ast)
             if (fun->isVirtual()
                     || (declId->asDestructorName()
                         && hasVirtualDestructor(_context.lookupType(fun->enclosingScope())))) {
-                addUse(declId, SemanticInfo::VirtualMethodUse);
+                addUse(declId, CppHighlightingSupport::VirtualMethodUse);
             } else if (!maybeAddFunction(_context.lookup(fun->name(),
                                                          fun->enclosingScope()),
                                          declId, fun->argumentCount())) {
@@ -1050,8 +1050,8 @@ bool CheckSymbols::visit(FunctionDefinitionAST *ast)
     accept(ast->function_body);
 
     const LocalSymbols locals(_doc, ast);
-    foreach (const QList<SemanticInfo::Use> &uses, locals.uses) {
-        foreach (const SemanticInfo::Use &u, uses)
+    foreach (const QList<Result> &uses, locals.uses) {
+        foreach (const Result &u, uses)
             addUse(u);
     }
 
@@ -1062,7 +1062,7 @@ bool CheckSymbols::visit(FunctionDefinitionAST *ast)
     return false;
 }
 
-void CheckSymbols::addUse(NameAST *ast, UseKind kind)
+void CheckSymbols::addUse(NameAST *ast, Kind kind)
 {
     if (! ast)
         return;
@@ -1085,7 +1085,7 @@ void CheckSymbols::addUse(NameAST *ast, UseKind kind)
     addUse(startToken, kind);
 }
 
-void CheckSymbols::addUse(unsigned tokenIndex, UseKind kind)
+void CheckSymbols::addUse(unsigned tokenIndex, Kind kind)
 {
     if (! tokenIndex)
         return;
@@ -1098,11 +1098,11 @@ void CheckSymbols::addUse(unsigned tokenIndex, UseKind kind)
     getTokenStartPosition(tokenIndex, &line, &column);
     const unsigned length = tok.length();
 
-    const Use use(line, column, length, kind);
+    const Result use(line, column, length, kind);
     addUse(use);
 }
 
-void CheckSymbols::addUse(const Use &use)
+void CheckSymbols::addUse(const Result &use)
 {
     if (use.isInvalid())
         return;
@@ -1134,7 +1134,7 @@ void CheckSymbols::addType(ClassOrNamespace *b, NameAST *ast)
     unsigned line, column;
     getTokenStartPosition(startToken, &line, &column);
     const unsigned length = tok.length();
-    const Use use(line, column, length, SemanticInfo::TypeUse);
+    const Result use(line, column, length, CppHighlightingSupport::TypeUse);
     addUse(use);
 }
 
@@ -1176,14 +1176,14 @@ bool CheckSymbols::maybeAddTypeOrStatic(const QList<LookupItem> &candidates, Nam
             getTokenStartPosition(startToken, &line, &column);
             const unsigned length = tok.length();
 
-            UseKind kind = SemanticInfo::TypeUse;
+            Kind kind = CppHighlightingSupport::TypeUse;
             if (c->enclosingEnum() != 0)
-                kind = SemanticInfo::EnumerationUse;
+                kind = CppHighlightingSupport::EnumerationUse;
             else if (c->isStatic())
                 // treat static variable as a field(highlighting)
-                kind = SemanticInfo::FieldUse;
+                kind = CppHighlightingSupport::FieldUse;
 
-            const Use use(line, column, length, kind);
+            const Result use(line, column, length, kind);
             addUse(use);
 
             return true;
@@ -1218,7 +1218,7 @@ bool CheckSymbols::maybeAddField(const QList<LookupItem> &candidates, NameAST *a
         getTokenStartPosition(startToken, &line, &column);
         const unsigned length = tok.length();
 
-        const Use use(line, column, length, SemanticInfo::FieldUse);
+        const Result use(line, column, length, CppHighlightingSupport::FieldUse);
         addUse(use);
 
         return true;
@@ -1243,7 +1243,7 @@ bool CheckSymbols::maybeAddFunction(const QList<LookupItem> &candidates, NameAST
         return false;
 
     enum { Match_None, Match_TooManyArgs, Match_TooFewArgs, Match_Ok } matchType = Match_None;
-    SemanticInfo::UseKind kind = SemanticInfo::FunctionUse;
+    Kind kind = CppHighlightingSupport::FunctionUse;
     foreach (const LookupItem &r, candidates) {
         Symbol *c = r.declaration();
 
@@ -1270,21 +1270,21 @@ bool CheckSymbols::maybeAddFunction(const QList<LookupItem> &candidates, NameAST
 
         if (argumentCount < funTy->minimumArgumentCount()) {
             if (matchType != Match_Ok) {
-                kind = funTy->isVirtual() ? SemanticInfo::VirtualMethodUse : SemanticInfo::FunctionUse;
+                kind = funTy->isVirtual() ? CppHighlightingSupport::VirtualMethodUse : CppHighlightingSupport::FunctionUse;
                 matchType = Match_TooFewArgs;
             }
         } else if (argumentCount > funTy->argumentCount() && ! funTy->isVariadic()) {
             if (matchType != Match_Ok) {
                 matchType = Match_TooManyArgs;
-                kind = funTy->isVirtual() ? SemanticInfo::VirtualMethodUse : SemanticInfo::FunctionUse;
+                kind = funTy->isVirtual() ? CppHighlightingSupport::VirtualMethodUse : CppHighlightingSupport::FunctionUse;
             }
         } else if (!funTy->isVirtual()) {
             matchType = Match_Ok;
-            kind = SemanticInfo::FunctionUse;
+            kind = CppHighlightingSupport::FunctionUse;
             //continue, to check if there is a matching candidate which is virtual
         } else {
             matchType = Match_Ok;
-            kind = SemanticInfo::VirtualMethodUse;
+            kind = CppHighlightingSupport::VirtualMethodUse;
             break;
         }
     }
@@ -1294,7 +1294,7 @@ bool CheckSymbols::maybeAddFunction(const QList<LookupItem> &candidates, NameAST
         if (highlightCtorDtorAsType
                 && (isConstructor || isDestructor)
                 && maybeType(ast->name)
-                && kind == SemanticInfo::FunctionUse) {
+                && kind == CppHighlightingSupport::FunctionUse) {
             return false;
         }
 
@@ -1308,7 +1308,7 @@ bool CheckSymbols::maybeAddFunction(const QList<LookupItem> &candidates, NameAST
         else if (matchType == Match_TooManyArgs)
             warning(line, column, QCoreApplication::translate("CPlusPlus::CheckSymbols", "Too many arguments"), length);
 
-        const Use use(line, column, length, kind);
+        const Result use(line, column, length, kind);
         addUse(use);
 
         return true;
diff --git a/src/plugins/cpptools/cppchecksymbols.h b/src/plugins/cpptools/cppchecksymbols.h
index 814516f221..870bc709f8 100644
--- a/src/plugins/cpptools/cppchecksymbols.h
+++ b/src/plugins/cpptools/cppchecksymbols.h
@@ -31,6 +31,7 @@
 #define CPLUSPLUSCHECKSYMBOLS_H
 
 #include "cpptools_global.h"
+#include "cpphighlightingsupport.h"
 #include "cppsemanticinfo.h"
 
 #include <cplusplus/TypeOfExpression.h>
@@ -44,17 +45,17 @@ namespace CppTools {
 class CPPTOOLS_EXPORT CheckSymbols:
         protected CPlusPlus::ASTVisitor,
         public QRunnable,
-        public QFutureInterface<TextEditor::SemanticHighlighter::Result>
+        public QFutureInterface<TextEditor::HighlightingResult>
 {
 public:
     virtual ~CheckSymbols();
 
-    typedef TextEditor::SemanticHighlighter::Result Use;
-    typedef CppTools::SemanticInfo::UseKind UseKind;
+    typedef TextEditor::HighlightingResult Result;
+    typedef CppHighlightingSupport::Kind Kind;
 
     virtual void run();
 
-    typedef QFuture<Use> Future;
+    typedef QFuture<Result> Future;
 
     Future start()
     {
@@ -67,14 +68,14 @@ public:
 
     static Future go(CPlusPlus::Document::Ptr doc,
                      const CPlusPlus::LookupContext &context,
-                     const QList<Use> &macroUses);
+                     const QList<Result> &macroUses);
 
-    static QMap<int, QVector<Use> > chunks(const QFuture<Use> &future, int from, int to)
+    static QMap<int, QVector<Result> > chunks(const QFuture<Result> &future, int from, int to)
     {
-        QMap<int, QVector<Use> > chunks;
+        QMap<int, QVector<Result> > chunks;
 
         for (int i = from; i < to; ++i) {
-            const Use use = future.resultAt(i);
+            const Result use = future.resultAt(i);
             if (use.isInvalid())
                 continue;
 
@@ -91,7 +92,7 @@ protected:
 
     CheckSymbols(CPlusPlus::Document::Ptr doc,
                  const CPlusPlus::LookupContext &context,
-                 const QList<Use> &macroUses);
+                 const QList<Result> &otherUses);
 
     bool hasVirtualDestructor(CPlusPlus::Class *klass) const;
     bool hasVirtualDestructor(CPlusPlus::ClassOrNamespace *binding) const;
@@ -110,9 +111,9 @@ protected:
     void checkName(CPlusPlus::NameAST *ast, CPlusPlus::Scope *scope = 0);
     CPlusPlus::ClassOrNamespace *checkNestedName(CPlusPlus::QualifiedNameAST *ast);
 
-    void addUse(const Use &use);
-    void addUse(unsigned tokenIndex, UseKind kind);
-    void addUse(CPlusPlus::NameAST *name, UseKind kind);
+    void addUse(const Result &use);
+    void addUse(unsigned tokenIndex, Kind kind);
+    void addUse(CPlusPlus::NameAST *name, Kind kind);
 
     void addType(CPlusPlus::ClassOrNamespace *b, CPlusPlus::NameAST *ast);
 
@@ -177,10 +178,10 @@ private:
     QSet<QByteArray> _potentialFunctions;
     QSet<QByteArray> _potentialStatics;
     QList<CPlusPlus::AST *> _astStack;
-    QVector<Use> _usages;
+    QVector<Result> _usages;
     int _chunkSize;
     unsigned _lineOfLastUsage;
-    QList<Use> _macroUses;
+    QList<Result> _macroUses;
 };
 
 } // namespace CppTools
diff --git a/src/plugins/cpptools/cpphighlightingsupport.h b/src/plugins/cpptools/cpphighlightingsupport.h
index 1e92651405..037c50e5ad 100644
--- a/src/plugins/cpptools/cpphighlightingsupport.h
+++ b/src/plugins/cpptools/cpphighlightingsupport.h
@@ -47,14 +47,26 @@ namespace CppTools {
 class CPPTOOLS_EXPORT CppHighlightingSupport
 {
 public:
-    typedef TextEditor::SemanticHighlighter::Result Use;
+    enum Kind {
+        Unknown = 0,
+        TypeUse,
+        LocalUse,
+        FieldUse,
+        EnumerationUse,
+        VirtualMethodUse,
+        LabelUse,
+        MacroUse,
+        FunctionUse,
+        PseudoKeywordUse
+    };
 
 public:
     CppHighlightingSupport(TextEditor::ITextEditor *editor);
     virtual ~CppHighlightingSupport() = 0;
 
-    virtual QFuture<Use> highlightingFuture(const CPlusPlus::Document::Ptr &doc,
-                                            const CPlusPlus::Snapshot &snapshot) const = 0;
+    virtual QFuture<TextEditor::HighlightingResult> highlightingFuture(
+            const CPlusPlus::Document::Ptr &doc,
+            const CPlusPlus::Snapshot &snapshot) const = 0;
 
 protected:
     TextEditor::ITextEditor *editor() const
diff --git a/src/plugins/cpptools/cpphighlightingsupportinternal.cpp b/src/plugins/cpptools/cpphighlightingsupportinternal.cpp
index 44fcbeb279..ae39a0a076 100644
--- a/src/plugins/cpptools/cpphighlightingsupportinternal.cpp
+++ b/src/plugins/cpptools/cpphighlightingsupportinternal.cpp
@@ -49,22 +49,23 @@ CppHighlightingSupportInternal::~CppHighlightingSupportInternal()
 {
 }
 
-QFuture<CppHighlightingSupport::Use> CppHighlightingSupportInternal::highlightingFuture(
+QFuture<TextEditor::HighlightingResult> CppHighlightingSupportInternal::highlightingFuture(
         const Document::Ptr &doc,
         const Snapshot &snapshot) const
 {
-    QList<CheckSymbols::Use> macroUses;
+    typedef TextEditor::HighlightingResult Result;
+    QList<Result> macroUses;
 
-    //Get macro definitions
+    // Get macro definitions
     foreach (const CPlusPlus::Macro& macro, doc->definedMacros()) {
         int line, column;
         editor()->convertPosition(macro.offset(), &line, &column);
         ++column; //Highlighting starts at (column-1) --> compensate here
-        CheckSymbols::Use use(line, column, macro.name().size(), SemanticInfo::MacroUse);
+        Result use(line, column, macro.name().size(), MacroUse);
         macroUses.append(use);
     }
 
-    //Get macro uses
+    // Get macro uses
     foreach (const Document::MacroUse &macro, doc->macroUses()) {
         const QString name = QString::fromUtf8(macro.macro().name());
 
@@ -84,7 +85,7 @@ QFuture<CppHighlightingSupport::Use> CppHighlightingSupportInternal::highlightin
         int line, column;
         editor()->convertPosition(macro.begin(), &line, &column);
         ++column; //Highlighting starts at (column-1) --> compensate here
-        CheckSymbols::Use use(line, column, name.size(), SemanticInfo::MacroUse);
+        Result use(line, column, name.size(), MacroUse);
         macroUses.append(use);
     }
 
diff --git a/src/plugins/cpptools/cpphighlightingsupportinternal.h b/src/plugins/cpptools/cpphighlightingsupportinternal.h
index 5bda43274d..9ca1cf7713 100644
--- a/src/plugins/cpptools/cpphighlightingsupportinternal.h
+++ b/src/plugins/cpptools/cpphighlightingsupportinternal.h
@@ -40,14 +40,12 @@ namespace Internal {
 class CppHighlightingSupportInternal: public CppHighlightingSupport
 {
 public:
-    typedef TextEditor::SemanticHighlighter::Result Use;
-
-public:
     CppHighlightingSupportInternal(TextEditor::ITextEditor *editor);
     virtual ~CppHighlightingSupportInternal();
 
-    virtual QFuture<Use> highlightingFuture(const CPlusPlus::Document::Ptr &doc,
-                                            const CPlusPlus::Snapshot &snapshot) const;
+    virtual QFuture<TextEditor::HighlightingResult> highlightingFuture(
+            const CPlusPlus::Document::Ptr &doc,
+            const CPlusPlus::Snapshot &snapshot) const;
 };
 
 class CppHighlightingSupportInternalFactory: public CppHighlightingSupportFactory
diff --git a/src/plugins/cpptools/cpplocalsymbols.cpp b/src/plugins/cpptools/cpplocalsymbols.cpp
index b37a7230b7..361fd5d9d6 100644
--- a/src/plugins/cpptools/cpplocalsymbols.cpp
+++ b/src/plugins/cpptools/cpplocalsymbols.cpp
@@ -27,6 +27,7 @@
 **
 ****************************************************************************/
 
+#include "cpphighlightingsupport.h"
 #include "cpplocalsymbols.h"
 
 #include "cppsemanticinfo.h"
@@ -73,6 +74,8 @@ protected:
     using ASTVisitor::visit;
     using ASTVisitor::endVisit;
 
+    typedef TextEditor::HighlightingResult HighlightingResult;
+
     void enterScope(Scope *scope)
     {
         _scopeStack.append(scope);
@@ -86,7 +89,9 @@ protected:
                         const Identifier *id = member->identifier();
                         unsigned line, column;
                         getTokenStartPosition(member->sourceLocation(), &line, &column);
-                        localUses[member].append(SemanticInfo::Use(line, column, id->size(), SemanticInfo::LocalUse));
+                        localUses[member].append(
+                                    HighlightingResult(line, column, id->size(),
+                                                       CppHighlightingSupport::LocalUse));
                     }
                 }
             }
@@ -107,7 +112,9 @@ protected:
                     else if (!member->isGenerated() && (member->sourceLocation() < firstToken || member->enclosingScope()->isFunction())) {
                         unsigned line, column;
                         getTokenStartPosition(simpleName->identifier_token, &line, &column);
-                        localUses[member].append(SemanticInfo::Use(line, column, id->size(), SemanticInfo::LocalUse));
+                        localUses[member].append(
+                                    HighlightingResult(line, column, id->size(),
+                                                       CppHighlightingSupport::LocalUse));
                         return false;
                     }
                 }
diff --git a/src/plugins/cpptools/cppsemanticinfo.h b/src/plugins/cpptools/cppsemanticinfo.h
index 8cdc75b790..afa3c20f6b 100644
--- a/src/plugins/cpptools/cppsemanticinfo.h
+++ b/src/plugins/cpptools/cppsemanticinfo.h
@@ -43,19 +43,7 @@ namespace CppTools {
 class CPPTOOLS_EXPORT SemanticInfo
 {
 public:
-    enum UseKind {
-        Unknown = 0,
-        TypeUse,
-        LocalUse,
-        FieldUse,
-        EnumerationUse,
-        VirtualMethodUse,
-        LabelUse,
-        MacroUse,
-        FunctionUse,
-        PseudoKeywordUse
-    };
-    typedef TextEditor::SemanticHighlighter::Result Use;
+    typedef TextEditor::HighlightingResult Use;
 
     typedef QHash<CPlusPlus::Symbol *, QList<Use> > LocalUseMap;
     typedef QHashIterator<CPlusPlus::Symbol *, QList<Use> > LocalUseIterator;
diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.h b/src/plugins/qmljseditor/qmljssemantichighlighter.h
index 597e188c5f..f9195b959e 100644
--- a/src/plugins/qmljseditor/qmljssemantichighlighter.h
+++ b/src/plugins/qmljseditor/qmljssemantichighlighter.h
@@ -78,7 +78,7 @@ public:
         Max // number of the last used value (to generate the warning formats)
     };
 
-    typedef TextEditor::SemanticHighlighter::Result Use;
+    typedef TextEditor::HighlightingResult Use;
 
     SemanticHighlighter(QmlJSTextEditorWidget *editor);
 
diff --git a/src/plugins/texteditor/semantichighlighter.cpp b/src/plugins/texteditor/semantichighlighter.cpp
index 14c869c88c..0b480db6ee 100644
--- a/src/plugins/texteditor/semantichighlighter.cpp
+++ b/src/plugins/texteditor/semantichighlighter.cpp
@@ -41,7 +41,7 @@ using namespace TextEditor::SemanticHighlighter;
 
 void TextEditor::SemanticHighlighter::incrementalApplyExtraAdditionalFormats(
         SyntaxHighlighter *highlighter,
-        const QFuture<Result> &future,
+        const QFuture<HighlightingResult> &future,
         int from, int to,
         const QHash<int, QTextCharFormat> &kindToFormat)
 {
@@ -54,7 +54,7 @@ void TextEditor::SemanticHighlighter::incrementalApplyExtraAdditionalFormats(
     // be cleaned of additional extra formats if they have no results
     int currentBlockNumber = 0;
     for (int i = from - 1; i >= 0; --i) {
-        const Result &result = future.resultAt(i);
+        const HighlightingResult &result = future.resultAt(i);
         const int blockNumber = result.line - 1;
         if (blockNumber < firstResultBlockNumber) {
             // stop! found where last format stopped
@@ -69,7 +69,7 @@ void TextEditor::SemanticHighlighter::incrementalApplyExtraAdditionalFormats(
     QTC_ASSERT(currentBlockNumber < doc->blockCount(), return);
     QTextBlock b = doc->findBlockByNumber(currentBlockNumber);
 
-    Result result = future.resultAt(from);
+    HighlightingResult result = future.resultAt(from);
     for (int i = from; i < to && b.isValid(); ) {
         const int blockNumber = result.line - 1;
         QTC_ASSERT(blockNumber < doc->blockCount(), return);
@@ -111,12 +111,12 @@ void TextEditor::SemanticHighlighter::incrementalApplyExtraAdditionalFormats(
 
 void TextEditor::SemanticHighlighter::clearExtraAdditionalFormatsUntilEnd(
         SyntaxHighlighter *highlighter,
-        const QFuture<Result> &future)
+        const QFuture<HighlightingResult> &future)
 {
     // find block number of last result
     int lastBlockNumber = 0;
     for (int i = future.resultCount() - 1; i >= 0; --i) {
-        const Result &result = future.resultAt(i);
+        const HighlightingResult &result = future.resultAt(i);
         if (result.line) {
             lastBlockNumber = result.line - 1;
             break;
diff --git a/src/plugins/texteditor/semantichighlighter.h b/src/plugins/texteditor/semantichighlighter.h
index a57de4eedd..8a48aed95b 100644
--- a/src/plugins/texteditor/semantichighlighter.h
+++ b/src/plugins/texteditor/semantichighlighter.h
@@ -44,14 +44,12 @@ namespace TextEditor {
 
 class SyntaxHighlighter;
 
-namespace SemanticHighlighter {
-
-class TEXTEDITOR_EXPORT Result {
+class TEXTEDITOR_EXPORT HighlightingResult {
 public:
     unsigned line; // 1-based
     unsigned column; // 1-based
     unsigned length;
-    int kind;
+    int kind; /// The various highlighters can define their own kind of results.
 
     bool isValid() const
     { return line != 0; }
@@ -59,21 +57,25 @@ public:
     bool isInvalid() const
     { return line == 0; }
 
-    Result()
-        : line(0), column(0), length(0), kind(-1) {}
-    Result(unsigned line, unsigned column, unsigned length, int kind)
-        : line(line), column(column), length(length), kind(kind) {}
+    HighlightingResult()
+        : line(0), column(0), length(0), kind(0)
+    {}
+
+    HighlightingResult(unsigned line, unsigned column, unsigned length, int kind)
+        : line(line), column(column), length(length), kind(kind)
+    {}
 
-    bool operator==(const Result& other) const
+    bool operator==(const HighlightingResult& other) const
     {
-        return
-            line == other.line &&
-            column == other.column &&
-            length == other.length &&
-            kind == other.kind;
+        return line == other.line
+                && column == other.column
+                && length == other.length
+                && kind == other.kind;
     }
 };
 
+namespace SemanticHighlighter {
+
 // Applies the future results [from, to) and applies the extra formats
 // indicated by Result::kind and kindToFormat to the correct location using
 // SyntaxHighlighter::setExtraAdditionalFormats.
@@ -83,7 +85,7 @@ public:
 // Requires that results of the Future are ordered by line.
 void TEXTEDITOR_EXPORT incrementalApplyExtraAdditionalFormats(
         SyntaxHighlighter *highlighter,
-        const QFuture<Result> &future,
+        const QFuture<HighlightingResult> &future,
         int from, int to,
         const QHash<int, QTextCharFormat> &kindToFormat);
 
@@ -92,7 +94,7 @@ void TEXTEDITOR_EXPORT incrementalApplyExtraAdditionalFormats(
 // Requires that results of the Future are ordered by line.
 void TEXTEDITOR_EXPORT clearExtraAdditionalFormatsUntilEnd(
         SyntaxHighlighter *highlighter,
-        const QFuture<Result> &future);
+        const QFuture<HighlightingResult> &future);
 
 
 } // namespace SemanticHighlighter
diff --git a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
index 2a7d082c18..2208f768b9 100644
--- a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
+++ b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
@@ -32,6 +32,7 @@
 
 #include <cpptools/cppchecksymbols.h>
 #include <cpptools/cppsemanticinfo.h>
+#include <cpptools/cpphighlightingsupport.h>
 #include <texteditor/semantichighlighter.h>
 #include <utils/fileutils.h>
 
@@ -47,34 +48,34 @@
 using namespace CPlusPlus;
 using namespace CppTools;
 
-typedef CheckSymbols::Use Use;
-typedef CheckSymbols::UseKind UseKind;
+typedef CheckSymbols::Result Use;
+typedef CheckSymbols::Kind UseKind;
 
 static QString useKindToString(UseKind useKind)
 {
     switch (useKind) {
-    case SemanticInfo::Unknown:
-        return QLatin1String("SemanticInfo::Unknown");
-    case SemanticInfo::TypeUse:
-        return QLatin1String("SemanticInfo::TypeUse");
-    case SemanticInfo::LocalUse:
-        return QLatin1String("SemanticInfo::LocalUse");
-    case SemanticInfo::FieldUse:
-        return QLatin1String("SemanticInfo::FieldUse");
-    case SemanticInfo::EnumerationUse:
-        return QLatin1String("SemanticInfo::EnumerationUse");
-    case SemanticInfo::VirtualMethodUse:
-        return QLatin1String("SemanticInfo::VirtualMethodUse");
-    case SemanticInfo::LabelUse:
-        return QLatin1String("SemanticInfo::LabelUse");
-    case SemanticInfo::MacroUse:
-        return QLatin1String("SemanticInfo::MacroUse");
-    case SemanticInfo::FunctionUse:
-        return QLatin1String("SemanticInfo::FunctionUse");
-    case SemanticInfo::PseudoKeywordUse:
-        return QLatin1String("SemanticInfo::PseudoKeywordUse");
+    case CppHighlightingSupport::Unknown:
+        return QLatin1String("CppHighlightingSupport::Unknown");
+    case CppHighlightingSupport::TypeUse:
+        return QLatin1String("CppHighlightingSupport::TypeUse");
+    case CppHighlightingSupport::LocalUse:
+        return QLatin1String("CppHighlightingSupport::LocalUse");
+    case CppHighlightingSupport::FieldUse:
+        return QLatin1String("CppHighlightingSupport::FieldUse");
+    case CppHighlightingSupport::EnumerationUse:
+        return QLatin1String("CppHighlightingSupport::EnumerationUse");
+    case CppHighlightingSupport::VirtualMethodUse:
+        return QLatin1String("CppHighlightingSupport::VirtualMethodUse");
+    case CppHighlightingSupport::LabelUse:
+        return QLatin1String("CppHighlightingSupport::LabelUse");
+    case CppHighlightingSupport::MacroUse:
+        return QLatin1String("CppHighlightingSupport::MacroUse");
+    case CppHighlightingSupport::FunctionUse:
+        return QLatin1String("CppHighlightingSupport::FunctionUse");
+    case CppHighlightingSupport::PseudoKeywordUse:
+        return QLatin1String("CppHighlightingSupport::PseudoKeywordUse");
     default:
-        return QLatin1String("Unknown Kind");
+        Q_UNREACHABLE();
     }
 }
 
@@ -194,8 +195,8 @@ void tst_CheckSymbols::test_checksymbols_TypeUse()
         "namespace N {}\n"
         "using namespace N;\n";
     const QList<Use> expectedUses = QList<Use>()
-        << Use(1, 11, 1, SemanticInfo::TypeUse)
-        << Use(2, 17, 1, SemanticInfo::TypeUse);
+        << Use(1, 11, 1, CppHighlightingSupport::TypeUse)
+        << Use(2, 17, 1, CppHighlightingSupport::TypeUse);
 
     TestData::check(source, expectedUses);
 }
@@ -208,8 +209,8 @@ void tst_CheckSymbols::test_checksymbols_LocalUse()
         "   int i;\n"
         "}\n";
     const QList<Use> expectedUses = QList<Use>()
-        << Use(1, 5, 1, SemanticInfo::FunctionUse)
-        << Use(3, 8, 1, SemanticInfo::LocalUse);
+        << Use(1, 5, 1, CppHighlightingSupport::FunctionUse)
+        << Use(3, 8, 1, CppHighlightingSupport::LocalUse);
 
     TestData::check(source, expectedUses);
 }
@@ -227,15 +228,15 @@ void tst_CheckSymbols::test_checksymbols_FieldUse()
         "    s.i = 2;\n"
         "}\n";
     const QList<Use> expectedUses = QList<Use>()
-        << Use(1, 8, 1, SemanticInfo::TypeUse)
-        << Use(2, 9, 1, SemanticInfo::FieldUse)
-        << Use(3, 5, 1, SemanticInfo::TypeUse)
-        << Use(3, 11, 1, SemanticInfo::FieldUse)
-        << Use(5, 5, 1, SemanticInfo::FunctionUse)
-        << Use(7, 5, 1, SemanticInfo::TypeUse)
-        << Use(7, 7, 1, SemanticInfo::LocalUse)
-        << Use(8, 5, 1, SemanticInfo::LocalUse)
-        << Use(8, 7, 1, SemanticInfo::FieldUse)
+        << Use(1, 8, 1, CppHighlightingSupport::TypeUse)
+        << Use(2, 9, 1, CppHighlightingSupport::FieldUse)
+        << Use(3, 5, 1, CppHighlightingSupport::TypeUse)
+        << Use(3, 11, 1, CppHighlightingSupport::FieldUse)
+        << Use(5, 5, 1, CppHighlightingSupport::FunctionUse)
+        << Use(7, 5, 1, CppHighlightingSupport::TypeUse)
+        << Use(7, 7, 1, CppHighlightingSupport::LocalUse)
+        << Use(8, 5, 1, CppHighlightingSupport::LocalUse)
+        << Use(8, 7, 1, CppHighlightingSupport::FieldUse)
            ;
 
     TestData::check(source, expectedUses);
@@ -247,10 +248,10 @@ void tst_CheckSymbols::test_checksymbols_EnumerationUse()
         "enum E { Red, Green, Blue };\n"
         "E e = Red\n";
     const QList<Use> expectedUses = QList<Use>()
-        << Use(1, 6, 1, SemanticInfo::TypeUse)
-        << Use(1, 10, 3, SemanticInfo::EnumerationUse)
-        << Use(1, 15, 5, SemanticInfo::EnumerationUse)
-        << Use(1, 22, 4, SemanticInfo::EnumerationUse)
+        << Use(1, 6, 1, CppHighlightingSupport::TypeUse)
+        << Use(1, 10, 3, CppHighlightingSupport::EnumerationUse)
+        << Use(1, 15, 5, CppHighlightingSupport::EnumerationUse)
+        << Use(1, 22, 4, CppHighlightingSupport::EnumerationUse)
            ;
 
     TestData::check(source, expectedUses);
@@ -266,11 +267,11 @@ void tst_CheckSymbols::test_checksymbols_VirtualMethodUse()
         "    bool isThere();\n"         // 5
         "};\n";
     const QList<Use> expectedUses = QList<Use>()
-        << Use(1, 7, 1, SemanticInfo::TypeUse)              // B
-        << Use(2, 18, 7, SemanticInfo::VirtualMethodUse)    // isThere
-        << Use(4, 7, 1, SemanticInfo::TypeUse)              // D
-        << Use(4, 17, 1, SemanticInfo::TypeUse)             // B
-        << Use(5, 10, 7, SemanticInfo::VirtualMethodUse);   // isThere
+        << Use(1, 7, 1, CppHighlightingSupport::TypeUse)              // B
+        << Use(2, 18, 7, CppHighlightingSupport::VirtualMethodUse)    // isThere
+        << Use(4, 7, 1, CppHighlightingSupport::TypeUse)              // D
+        << Use(4, 17, 1, CppHighlightingSupport::TypeUse)             // B
+        << Use(5, 10, 7, CppHighlightingSupport::VirtualMethodUse);   // isThere
 
     TestData::check(source, expectedUses);
 }
@@ -284,9 +285,9 @@ void tst_CheckSymbols::test_checksymbols_LabelUse()
         "   g: return 1;\n"
         "}\n";
     const QList<Use> expectedUses = QList<Use>()
-        << Use(1, 5, 1, SemanticInfo::FunctionUse)
-        << Use(3, 9, 1, SemanticInfo::LabelUse)
-        << Use(4, 4, 1, SemanticInfo::LabelUse);
+        << Use(1, 5, 1, CppHighlightingSupport::FunctionUse)
+        << Use(3, 9, 1, CppHighlightingSupport::LabelUse)
+        << Use(4, 4, 1, CppHighlightingSupport::LabelUse);
 
     TestData::check(source, expectedUses);
 }
@@ -297,12 +298,12 @@ void tst_CheckSymbols::test_checksymbols_MacroUse()
         "#define FOO 1+1\n"
         "int f() { FOO }\n";
     const QList<Use> macroUses = QList<Use>()
-        << Use(1, 9, 3, SemanticInfo::MacroUse)
-        << Use(2, 11, 3, SemanticInfo::MacroUse);
+        << Use(1, 9, 3, CppHighlightingSupport::MacroUse)
+        << Use(2, 11, 3, CppHighlightingSupport::MacroUse);
     const QList<Use> expectedUses = QList<Use>()
-        << Use(1, 9, 3, SemanticInfo::MacroUse)
-        << Use(2, 5, 1, SemanticInfo::FunctionUse)
-        << Use(2, 11, 3, SemanticInfo::MacroUse)
+        << Use(1, 9, 3, CppHighlightingSupport::MacroUse)
+        << Use(2, 5, 1, CppHighlightingSupport::FunctionUse)
+        << Use(2, 11, 3, CppHighlightingSupport::MacroUse)
            ;
 
     TestData::check(source, expectedUses, macroUses);
@@ -314,9 +315,9 @@ void tst_CheckSymbols::test_checksymbols_FunctionUse()
         "int f();\n"
         "int g() { f(); }\n";
     const QList<Use> expectedUses = QList<Use>()
-        << Use(1, 5, 1, SemanticInfo::FunctionUse)
-        << Use(2, 5, 1, SemanticInfo::FunctionUse)
-        << Use(2, 11, 1, SemanticInfo::FunctionUse);
+        << Use(1, 5, 1, CppHighlightingSupport::FunctionUse)
+        << Use(2, 5, 1, CppHighlightingSupport::FunctionUse)
+        << Use(2, 11, 1, CppHighlightingSupport::FunctionUse);
 
     TestData::check(source, expectedUses);
 }
@@ -329,11 +330,11 @@ void tst_CheckSymbols::test_checksymbols_PseudoKeywordUse()
         "   virtual void f() final {}\n"
         "};\n";
     const QList<Use> expectedUses = QList<Use>()
-        << Use(1, 7, 1, SemanticInfo::TypeUse)
-        << Use(1, 37, 1, SemanticInfo::VirtualMethodUse)
-        << Use(1, 41, 8, SemanticInfo::PseudoKeywordUse)
-        << Use(2, 17, 1, SemanticInfo::VirtualMethodUse)
-        << Use(2, 21, 5, SemanticInfo::PseudoKeywordUse);
+        << Use(1, 7, 1, CppHighlightingSupport::TypeUse)
+        << Use(1, 37, 1, CppHighlightingSupport::VirtualMethodUse)
+        << Use(1, 41, 8, CppHighlightingSupport::PseudoKeywordUse)
+        << Use(2, 17, 1, CppHighlightingSupport::VirtualMethodUse)
+        << Use(2, 21, 5, CppHighlightingSupport::PseudoKeywordUse);
 
     TestData::check(source, expectedUses);
 }
@@ -362,22 +363,22 @@ void tst_CheckSymbols::test_checksymbols_StaticUse()
             ;
 
     const QList<Use> expectedUses = QList<Use>()
-            << Use(1, 8, 5, SemanticInfo::TypeUse)
-            << Use(3, 16, 3, SemanticInfo::FieldUse)
-            << Use(4, 12, 5, SemanticInfo::TypeUse)
-            << Use(6, 9, 5, SemanticInfo::TypeUse)
-            << Use(6, 16, 5, SemanticInfo::FieldUse)
-            << Use(7, 14, 3, SemanticInfo::FunctionUse)
-            << Use(11, 5, 5, SemanticInfo::TypeUse)
-            << Use(11, 12, 3, SemanticInfo::FieldUse)
-            << Use(13, 6, 5, SemanticInfo::TypeUse)
-            << Use(13, 13, 5, SemanticInfo::TypeUse)
-            << Use(13, 20, 3, SemanticInfo::FunctionUse)
-            << Use(15, 5, 3, SemanticInfo::FieldUse)
-            << Use(16, 5, 5, SemanticInfo::TypeUse)
-            << Use(16, 12, 3, SemanticInfo::FieldUse)
-            << Use(17, 5, 5, SemanticInfo::FieldUse)
-            << Use(17, 12, 3, SemanticInfo::FieldUse)
+            << Use(1, 8, 5, CppHighlightingSupport::TypeUse)
+            << Use(3, 16, 3, CppHighlightingSupport::FieldUse)
+            << Use(4, 12, 5, CppHighlightingSupport::TypeUse)
+            << Use(6, 9, 5, CppHighlightingSupport::TypeUse)
+            << Use(6, 16, 5, CppHighlightingSupport::FieldUse)
+            << Use(7, 14, 3, CppHighlightingSupport::FunctionUse)
+            << Use(11, 5, 5, CppHighlightingSupport::TypeUse)
+            << Use(11, 12, 3, CppHighlightingSupport::FieldUse)
+            << Use(13, 6, 5, CppHighlightingSupport::TypeUse)
+            << Use(13, 13, 5, CppHighlightingSupport::TypeUse)
+            << Use(13, 20, 3, CppHighlightingSupport::FunctionUse)
+            << Use(15, 5, 3, CppHighlightingSupport::FieldUse)
+            << Use(16, 5, 5, CppHighlightingSupport::TypeUse)
+            << Use(16, 12, 3, CppHighlightingSupport::FieldUse)
+            << Use(17, 5, 5, CppHighlightingSupport::FieldUse)
+            << Use(17, 12, 3, CppHighlightingSupport::FieldUse)
                ;
 
     TestData::check(source, expectedUses);
@@ -399,14 +400,14 @@ void tst_CheckSymbols::test_checksymbols_VariableHasTheSameNameAsEnumUse()
             "};\n"
             ;
     const QList<Use> expectedUses = QList<Use>()
-            << Use(1, 8, 3, SemanticInfo::TypeUse)
-            << Use(3, 10, 1, SemanticInfo::TypeUse)
-            << Use(3, 14, 3, SemanticInfo::EnumerationUse)
-            << Use(3, 19, 3, SemanticInfo::EnumerationUse)
-            << Use(6, 8, 3, SemanticInfo::TypeUse)
-            << Use(8, 9, 3, SemanticInfo::FieldUse)
-            << Use(9, 9, 3, SemanticInfo::FieldUse)
-            << Use(10, 9, 3, SemanticInfo::FieldUse)
+            << Use(1, 8, 3, CppHighlightingSupport::TypeUse)
+            << Use(3, 10, 1, CppHighlightingSupport::TypeUse)
+            << Use(3, 14, 3, CppHighlightingSupport::EnumerationUse)
+            << Use(3, 19, 3, CppHighlightingSupport::EnumerationUse)
+            << Use(6, 8, 3, CppHighlightingSupport::TypeUse)
+            << Use(8, 9, 3, CppHighlightingSupport::FieldUse)
+            << Use(9, 9, 3, CppHighlightingSupport::FieldUse)
+            << Use(10, 9, 3, CppHighlightingSupport::FieldUse)
                ;
 
     TestData::check(source, expectedUses);
@@ -431,22 +432,22 @@ void tst_CheckSymbols::test_checksymbols_NestedClassOfEnclosingTemplateUse()
             ;
 
     const QList<Use> expectedUses = QList<Use>()
-            << Use(1, 8, 3, SemanticInfo::TypeUse)
-            << Use(1, 18, 3, SemanticInfo::FieldUse)
-            << Use(3, 19, 1, SemanticInfo::TypeUse)
-            << Use(4, 8, 5, SemanticInfo::TypeUse)
-            << Use(6, 12, 6, SemanticInfo::TypeUse)
-            << Use(6, 21, 1, SemanticInfo::TypeUse)
-            << Use(6, 23, 2, SemanticInfo::FieldUse)
-            << Use(6, 29, 6, SemanticInfo::FieldUse)
-            << Use(9, 6, 3, SemanticInfo::FunctionUse)
-            << Use(11, 5, 5, SemanticInfo::TypeUse)
-            << Use(11, 11, 3, SemanticInfo::TypeUse)
-            << Use(11, 16, 4, SemanticInfo::LocalUse)
-            << Use(12, 5, 4, SemanticInfo::LocalUse)
-            << Use(12, 10, 6, SemanticInfo::FieldUse)
-            << Use(12, 17, 2, SemanticInfo::FieldUse)
-            << Use(12, 20, 3, SemanticInfo::FieldUse)
+            << Use(1, 8, 3, CppHighlightingSupport::TypeUse)
+            << Use(1, 18, 3, CppHighlightingSupport::FieldUse)
+            << Use(3, 19, 1, CppHighlightingSupport::TypeUse)
+            << Use(4, 8, 5, CppHighlightingSupport::TypeUse)
+            << Use(6, 12, 6, CppHighlightingSupport::TypeUse)
+            << Use(6, 21, 1, CppHighlightingSupport::TypeUse)
+            << Use(6, 23, 2, CppHighlightingSupport::FieldUse)
+            << Use(6, 29, 6, CppHighlightingSupport::FieldUse)
+            << Use(9, 6, 3, CppHighlightingSupport::FunctionUse)
+            << Use(11, 5, 5, CppHighlightingSupport::TypeUse)
+            << Use(11, 11, 3, CppHighlightingSupport::TypeUse)
+            << Use(11, 16, 4, CppHighlightingSupport::LocalUse)
+            << Use(12, 5, 4, CppHighlightingSupport::LocalUse)
+            << Use(12, 10, 6, CppHighlightingSupport::FieldUse)
+            << Use(12, 17, 2, CppHighlightingSupport::FieldUse)
+            << Use(12, 20, 3, CppHighlightingSupport::FieldUse)
             ;
 
     TestData::check(source, expectedUses);
@@ -467,12 +468,12 @@ void tst_CheckSymbols::test_checksymbols_8902_staticFunctionHighlightingAsMember
             ;
 
     const QList<Use> expectedUses = QList<Use>()
-            << Use(1, 8, 3, SemanticInfo::TypeUse)
-            << Use(3, 16, 3, SemanticInfo::FunctionUse)
-            << Use(6, 6, 3, SemanticInfo::FunctionUse)
-            << Use(8, 9, 3, SemanticInfo::LocalUse)
-            << Use(8, 15, 3, SemanticInfo::TypeUse)
-            << Use(8, 20, 3, SemanticInfo::FunctionUse)
+            << Use(1, 8, 3, CppHighlightingSupport::TypeUse)
+            << Use(3, 16, 3, CppHighlightingSupport::FunctionUse)
+            << Use(6, 6, 3, CppHighlightingSupport::FunctionUse)
+            << Use(8, 9, 3, CppHighlightingSupport::LocalUse)
+            << Use(8, 15, 3, CppHighlightingSupport::TypeUse)
+            << Use(8, 20, 3, CppHighlightingSupport::FunctionUse)
             ;
 
     TestData::check(source, expectedUses);
@@ -493,12 +494,12 @@ void tst_CheckSymbols::test_checksymbols_8902_staticFunctionHighlightingAsMember
             ;
 
     const QList<Use> expectedUses = QList<Use>()
-            << Use(1, 8, 3, SemanticInfo::TypeUse)
-            << Use(3, 16, 3, SemanticInfo::FunctionUse)
-            << Use(6, 6, 3, SemanticInfo::FunctionUse)
-            << Use(6, 14, 3, SemanticInfo::LocalUse)
-            << Use(8, 5, 3, SemanticInfo::TypeUse)
-            << Use(8, 10, 3, SemanticInfo::FunctionUse)
+            << Use(1, 8, 3, CppHighlightingSupport::TypeUse)
+            << Use(3, 16, 3, CppHighlightingSupport::FunctionUse)
+            << Use(6, 6, 3, CppHighlightingSupport::FunctionUse)
+            << Use(6, 14, 3, CppHighlightingSupport::LocalUse)
+            << Use(8, 5, 3, CppHighlightingSupport::TypeUse)
+            << Use(8, 10, 3, CppHighlightingSupport::FunctionUse)
             ;
 
     TestData::check(source, expectedUses);
@@ -520,12 +521,12 @@ void tst_CheckSymbols::test_checksymbols_8902_staticFunctionHighlightingAsMember
             ;
 
     const QList<Use> expectedUses = QList<Use>()
-            << Use(1, 8, 3, SemanticInfo::TypeUse)
-            << Use(3, 16, 3, SemanticInfo::FunctionUse)
-            << Use(6, 17, 3, SemanticInfo::TypeUse)
-            << Use(7, 6, 3, SemanticInfo::FunctionUse)
-            << Use(9, 5, 3, SemanticInfo::TypeUse)
-            << Use(9, 10, 3, SemanticInfo::FunctionUse)
+            << Use(1, 8, 3, CppHighlightingSupport::TypeUse)
+            << Use(3, 16, 3, CppHighlightingSupport::FunctionUse)
+            << Use(6, 17, 3, CppHighlightingSupport::TypeUse)
+            << Use(7, 6, 3, CppHighlightingSupport::FunctionUse)
+            << Use(9, 5, 3, CppHighlightingSupport::TypeUse)
+            << Use(9, 10, 3, CppHighlightingSupport::FunctionUse)
             ;
 
     TestData::check(source, expectedUses);
@@ -547,12 +548,12 @@ void tst_CheckSymbols::test_checksymbols_8902_staticFunctionHighlightingAsMember
             ;
 
     const QList<Use> expectedUses = QList<Use>()
-            << Use(1, 8, 3, SemanticInfo::TypeUse)
-            << Use(3, 16, 3, SemanticInfo::FunctionUse)
-            << Use(6, 8, 3, SemanticInfo::TypeUse)
-            << Use(7, 6, 3, SemanticInfo::FunctionUse)
-            << Use(9, 5, 3, SemanticInfo::TypeUse)
-            << Use(9, 10, 3, SemanticInfo::FunctionUse)
+            << Use(1, 8, 3, CppHighlightingSupport::TypeUse)
+            << Use(3, 16, 3, CppHighlightingSupport::FunctionUse)
+            << Use(6, 8, 3, CppHighlightingSupport::TypeUse)
+            << Use(7, 6, 3, CppHighlightingSupport::FunctionUse)
+            << Use(9, 5, 3, CppHighlightingSupport::TypeUse)
+            << Use(9, 10, 3, CppHighlightingSupport::FunctionUse)
             ;
 
     TestData::check(source, expectedUses);
@@ -584,25 +585,25 @@ void tst_CheckSymbols::test_checksymbols_QTCREATORBUG8890_danglingPointer()
         ;
 
     const QList<Use> expectedUses = QList<Use>()
-        << Use(1, 16, 1, SemanticInfo::TypeUse)
-        << Use(1, 25, 5, SemanticInfo::TypeUse)
-        << Use(3, 9, 1, SemanticInfo::TypeUse)
-        << Use(3, 11, 8, SemanticInfo::FunctionUse)
-        << Use(6, 16, 1, SemanticInfo::TypeUse)
-        << Use(6, 25, 8, SemanticInfo::TypeUse)
-        << Use(8, 9, 1, SemanticInfo::TypeUse)
-        << Use(8, 12, 8, SemanticInfo::FunctionUse)
-        << Use(11, 7, 3, SemanticInfo::TypeUse)
-        << Use(12, 10, 3, SemanticInfo::FunctionUse)
-        << Use(15, 6, 1, SemanticInfo::FunctionUse)
-        << Use(17, 5, 5, SemanticInfo::TypeUse)
-        << Use(17, 11, 8, SemanticInfo::TypeUse)
-        << Use(17, 20, 3, SemanticInfo::TypeUse)
-        << Use(17, 27, 4, SemanticInfo::LocalUse)
-        << Use(18, 5, 4, SemanticInfo::LocalUse)
-        << Use(18, 14, 3, SemanticInfo::FunctionUse)
-        << Use(19, 5, 4, SemanticInfo::LocalUse)
-        << Use(19, 14, 3, SemanticInfo::FunctionUse)
+        << Use(1, 16, 1, CppHighlightingSupport::TypeUse)
+        << Use(1, 25, 5, CppHighlightingSupport::TypeUse)
+        << Use(3, 9, 1, CppHighlightingSupport::TypeUse)
+        << Use(3, 11, 8, CppHighlightingSupport::FunctionUse)
+        << Use(6, 16, 1, CppHighlightingSupport::TypeUse)
+        << Use(6, 25, 8, CppHighlightingSupport::TypeUse)
+        << Use(8, 9, 1, CppHighlightingSupport::TypeUse)
+        << Use(8, 12, 8, CppHighlightingSupport::FunctionUse)
+        << Use(11, 7, 3, CppHighlightingSupport::TypeUse)
+        << Use(12, 10, 3, CppHighlightingSupport::FunctionUse)
+        << Use(15, 6, 1, CppHighlightingSupport::FunctionUse)
+        << Use(17, 5, 5, CppHighlightingSupport::TypeUse)
+        << Use(17, 11, 8, CppHighlightingSupport::TypeUse)
+        << Use(17, 20, 3, CppHighlightingSupport::TypeUse)
+        << Use(17, 27, 4, CppHighlightingSupport::LocalUse)
+        << Use(18, 5, 4, CppHighlightingSupport::LocalUse)
+        << Use(18, 14, 3, CppHighlightingSupport::FunctionUse)
+        << Use(19, 5, 4, CppHighlightingSupport::LocalUse)
+        << Use(19, 14, 3, CppHighlightingSupport::FunctionUse)
         ;
 
     TestData::check(source, expectedUses);
@@ -863,484 +864,484 @@ void tst_CheckSymbols::test_checksymbols_QTCREATORBUG8974_danglingPointer()
         ;
 
     const QList<Use> expectedUses = QList<Use>()
-        << Use(1, 17, 1, SemanticInfo::TypeUse)
-        << Use(2, 7, 9, SemanticInfo::TypeUse)
-        << Use(5, 12, 1, SemanticInfo::TypeUse)
-        << Use(5, 15, 8, SemanticInfo::FunctionUse)
-        << Use(8, 6, 3, SemanticInfo::FunctionUse)
-        << Use(10, 6, 3, SemanticInfo::FunctionUse)
-        << Use(12, 5, 9, SemanticInfo::TypeUse)
-        << Use(12, 28, 8, SemanticInfo::FunctionUse)
-        << Use(13, 5, 9, SemanticInfo::TypeUse)
-        << Use(13, 28, 8, SemanticInfo::FunctionUse)
-        << Use(14, 5, 9, SemanticInfo::TypeUse)
-        << Use(14, 28, 8, SemanticInfo::FunctionUse)
-        << Use(15, 5, 9, SemanticInfo::TypeUse)
-        << Use(15, 28, 8, SemanticInfo::FunctionUse)
-        << Use(16, 5, 9, SemanticInfo::TypeUse)
-        << Use(16, 28, 8, SemanticInfo::FunctionUse)
-        << Use(17, 5, 9, SemanticInfo::TypeUse)
-        << Use(17, 28, 8, SemanticInfo::FunctionUse)
-        << Use(18, 5, 9, SemanticInfo::TypeUse)
-        << Use(18, 28, 8, SemanticInfo::FunctionUse)
-        << Use(19, 5, 9, SemanticInfo::TypeUse)
-        << Use(19, 28, 8, SemanticInfo::FunctionUse)
-        << Use(20, 5, 9, SemanticInfo::TypeUse)
-        << Use(20, 28, 8, SemanticInfo::FunctionUse)
-        << Use(21, 5, 9, SemanticInfo::TypeUse)
-        << Use(21, 28, 8, SemanticInfo::FunctionUse)
-        << Use(22, 5, 9, SemanticInfo::TypeUse)
-        << Use(22, 28, 8, SemanticInfo::FunctionUse)
-        << Use(23, 5, 9, SemanticInfo::TypeUse)
-        << Use(23, 28, 8, SemanticInfo::FunctionUse)
-        << Use(24, 5, 9, SemanticInfo::TypeUse)
-        << Use(24, 28, 8, SemanticInfo::FunctionUse)
-        << Use(25, 5, 9, SemanticInfo::TypeUse)
-        << Use(25, 28, 8, SemanticInfo::FunctionUse)
-        << Use(26, 5, 9, SemanticInfo::TypeUse)
-        << Use(26, 28, 8, SemanticInfo::FunctionUse)
-        << Use(27, 5, 9, SemanticInfo::TypeUse)
-        << Use(27, 28, 8, SemanticInfo::FunctionUse)
-        << Use(28, 5, 9, SemanticInfo::TypeUse)
-        << Use(28, 28, 8, SemanticInfo::FunctionUse)
-        << Use(29, 5, 9, SemanticInfo::TypeUse)
-        << Use(29, 28, 8, SemanticInfo::FunctionUse)
-        << Use(30, 5, 9, SemanticInfo::TypeUse)
-        << Use(30, 28, 8, SemanticInfo::FunctionUse)
-        << Use(31, 5, 9, SemanticInfo::TypeUse)
-        << Use(31, 28, 8, SemanticInfo::FunctionUse)
-        << Use(32, 5, 9, SemanticInfo::TypeUse)
-        << Use(32, 28, 8, SemanticInfo::FunctionUse)
-        << Use(33, 5, 9, SemanticInfo::TypeUse)
-        << Use(33, 28, 8, SemanticInfo::FunctionUse)
-        << Use(34, 5, 9, SemanticInfo::TypeUse)
-        << Use(34, 28, 8, SemanticInfo::FunctionUse)
-        << Use(35, 5, 9, SemanticInfo::TypeUse)
-        << Use(35, 28, 8, SemanticInfo::FunctionUse)
-        << Use(36, 5, 9, SemanticInfo::TypeUse)
-        << Use(36, 28, 8, SemanticInfo::FunctionUse)
-        << Use(37, 5, 9, SemanticInfo::TypeUse)
-        << Use(37, 28, 8, SemanticInfo::FunctionUse)
-        << Use(38, 5, 9, SemanticInfo::TypeUse)
-        << Use(38, 28, 8, SemanticInfo::FunctionUse)
-        << Use(39, 5, 9, SemanticInfo::TypeUse)
-        << Use(39, 28, 8, SemanticInfo::FunctionUse)
-        << Use(40, 5, 9, SemanticInfo::TypeUse)
-        << Use(40, 28, 8, SemanticInfo::FunctionUse)
-        << Use(41, 5, 9, SemanticInfo::TypeUse)
-        << Use(41, 28, 8, SemanticInfo::FunctionUse)
-        << Use(42, 5, 9, SemanticInfo::TypeUse)
-        << Use(42, 28, 8, SemanticInfo::FunctionUse)
-        << Use(43, 5, 9, SemanticInfo::TypeUse)
-        << Use(43, 28, 8, SemanticInfo::FunctionUse)
-        << Use(44, 5, 9, SemanticInfo::TypeUse)
-        << Use(44, 28, 8, SemanticInfo::FunctionUse)
-        << Use(45, 5, 9, SemanticInfo::TypeUse)
-        << Use(45, 28, 8, SemanticInfo::FunctionUse)
-        << Use(46, 5, 9, SemanticInfo::TypeUse)
-        << Use(46, 28, 8, SemanticInfo::FunctionUse)
-        << Use(47, 5, 9, SemanticInfo::TypeUse)
-        << Use(47, 28, 8, SemanticInfo::FunctionUse)
-        << Use(48, 5, 9, SemanticInfo::TypeUse)
-        << Use(48, 28, 8, SemanticInfo::FunctionUse)
-        << Use(49, 5, 9, SemanticInfo::TypeUse)
-        << Use(49, 28, 8, SemanticInfo::FunctionUse)
-        << Use(50, 5, 9, SemanticInfo::TypeUse)
-        << Use(50, 28, 8, SemanticInfo::FunctionUse)
-        << Use(51, 5, 9, SemanticInfo::TypeUse)
-        << Use(51, 28, 8, SemanticInfo::FunctionUse)
-        << Use(52, 5, 9, SemanticInfo::TypeUse)
-        << Use(52, 28, 8, SemanticInfo::FunctionUse)
-        << Use(53, 5, 9, SemanticInfo::TypeUse)
-        << Use(53, 28, 8, SemanticInfo::FunctionUse)
-        << Use(54, 5, 9, SemanticInfo::TypeUse)
-        << Use(54, 28, 8, SemanticInfo::FunctionUse)
-        << Use(55, 5, 9, SemanticInfo::TypeUse)
-        << Use(55, 28, 8, SemanticInfo::FunctionUse)
-        << Use(56, 5, 9, SemanticInfo::TypeUse)
-        << Use(56, 28, 8, SemanticInfo::FunctionUse)
-        << Use(57, 5, 9, SemanticInfo::TypeUse)
-        << Use(57, 28, 8, SemanticInfo::FunctionUse)
-        << Use(58, 5, 9, SemanticInfo::TypeUse)
-        << Use(58, 28, 8, SemanticInfo::FunctionUse)
-        << Use(59, 5, 9, SemanticInfo::TypeUse)
-        << Use(59, 28, 8, SemanticInfo::FunctionUse)
-        << Use(60, 5, 9, SemanticInfo::TypeUse)
-        << Use(60, 28, 8, SemanticInfo::FunctionUse)
-        << Use(61, 5, 9, SemanticInfo::TypeUse)
-        << Use(61, 28, 8, SemanticInfo::FunctionUse)
-        << Use(62, 5, 9, SemanticInfo::TypeUse)
-        << Use(62, 28, 8, SemanticInfo::FunctionUse)
-        << Use(63, 5, 9, SemanticInfo::TypeUse)
-        << Use(63, 28, 8, SemanticInfo::FunctionUse)
-        << Use(64, 5, 9, SemanticInfo::TypeUse)
-        << Use(64, 28, 8, SemanticInfo::FunctionUse)
-        << Use(65, 5, 9, SemanticInfo::TypeUse)
-        << Use(65, 28, 8, SemanticInfo::FunctionUse)
-        << Use(66, 5, 9, SemanticInfo::TypeUse)
-        << Use(66, 28, 8, SemanticInfo::FunctionUse)
-        << Use(67, 5, 9, SemanticInfo::TypeUse)
-        << Use(67, 28, 8, SemanticInfo::FunctionUse)
-        << Use(68, 5, 9, SemanticInfo::TypeUse)
-        << Use(68, 28, 8, SemanticInfo::FunctionUse)
-        << Use(69, 5, 9, SemanticInfo::TypeUse)
-        << Use(69, 28, 8, SemanticInfo::FunctionUse)
-        << Use(70, 5, 9, SemanticInfo::TypeUse)
-        << Use(70, 28, 8, SemanticInfo::FunctionUse)
-        << Use(71, 5, 9, SemanticInfo::TypeUse)
-        << Use(71, 28, 8, SemanticInfo::FunctionUse)
-        << Use(72, 5, 9, SemanticInfo::TypeUse)
-        << Use(72, 28, 8, SemanticInfo::FunctionUse)
-        << Use(73, 5, 9, SemanticInfo::TypeUse)
-        << Use(73, 28, 8, SemanticInfo::FunctionUse)
-        << Use(74, 5, 9, SemanticInfo::TypeUse)
-        << Use(74, 28, 8, SemanticInfo::FunctionUse)
-        << Use(75, 5, 9, SemanticInfo::TypeUse)
-        << Use(75, 28, 8, SemanticInfo::FunctionUse)
-        << Use(76, 5, 9, SemanticInfo::TypeUse)
-        << Use(76, 28, 8, SemanticInfo::FunctionUse)
-        << Use(77, 5, 9, SemanticInfo::TypeUse)
-        << Use(77, 28, 8, SemanticInfo::FunctionUse)
-        << Use(78, 5, 9, SemanticInfo::TypeUse)
-        << Use(78, 28, 8, SemanticInfo::FunctionUse)
-        << Use(79, 5, 9, SemanticInfo::TypeUse)
-        << Use(79, 28, 8, SemanticInfo::FunctionUse)
-        << Use(80, 5, 9, SemanticInfo::TypeUse)
-        << Use(80, 28, 8, SemanticInfo::FunctionUse)
-        << Use(81, 5, 9, SemanticInfo::TypeUse)
-        << Use(81, 28, 8, SemanticInfo::FunctionUse)
-        << Use(82, 5, 9, SemanticInfo::TypeUse)
-        << Use(82, 28, 8, SemanticInfo::FunctionUse)
-        << Use(83, 5, 9, SemanticInfo::TypeUse)
-        << Use(83, 28, 8, SemanticInfo::FunctionUse)
-        << Use(84, 5, 9, SemanticInfo::TypeUse)
-        << Use(84, 28, 8, SemanticInfo::FunctionUse)
-        << Use(85, 5, 9, SemanticInfo::TypeUse)
-        << Use(85, 28, 8, SemanticInfo::FunctionUse)
-        << Use(86, 5, 9, SemanticInfo::TypeUse)
-        << Use(86, 28, 8, SemanticInfo::FunctionUse)
-        << Use(87, 5, 9, SemanticInfo::TypeUse)
-        << Use(87, 28, 8, SemanticInfo::FunctionUse)
-        << Use(88, 5, 9, SemanticInfo::TypeUse)
-        << Use(88, 28, 8, SemanticInfo::FunctionUse)
-        << Use(89, 5, 9, SemanticInfo::TypeUse)
-        << Use(89, 28, 8, SemanticInfo::FunctionUse)
-        << Use(90, 5, 9, SemanticInfo::TypeUse)
-        << Use(90, 28, 8, SemanticInfo::FunctionUse)
-        << Use(91, 5, 9, SemanticInfo::TypeUse)
-        << Use(91, 28, 8, SemanticInfo::FunctionUse)
-        << Use(92, 5, 9, SemanticInfo::TypeUse)
-        << Use(92, 28, 8, SemanticInfo::FunctionUse)
-        << Use(93, 5, 9, SemanticInfo::TypeUse)
-        << Use(93, 28, 8, SemanticInfo::FunctionUse)
-        << Use(94, 5, 9, SemanticInfo::TypeUse)
-        << Use(94, 28, 8, SemanticInfo::FunctionUse)
-        << Use(95, 5, 9, SemanticInfo::TypeUse)
-        << Use(95, 28, 8, SemanticInfo::FunctionUse)
-        << Use(96, 5, 9, SemanticInfo::TypeUse)
-        << Use(96, 28, 8, SemanticInfo::FunctionUse)
-        << Use(97, 5, 9, SemanticInfo::TypeUse)
-        << Use(97, 28, 8, SemanticInfo::FunctionUse)
-        << Use(98, 5, 9, SemanticInfo::TypeUse)
-        << Use(98, 28, 8, SemanticInfo::FunctionUse)
-        << Use(99, 5, 9, SemanticInfo::TypeUse)
-        << Use(99, 28, 8, SemanticInfo::FunctionUse)
-        << Use(100, 5, 9, SemanticInfo::TypeUse)
-        << Use(100, 28, 8, SemanticInfo::FunctionUse)
-        << Use(101, 5, 9, SemanticInfo::TypeUse)
-        << Use(101, 28, 8, SemanticInfo::FunctionUse)
-        << Use(102, 5, 9, SemanticInfo::TypeUse)
-        << Use(102, 28, 8, SemanticInfo::FunctionUse)
-        << Use(103, 5, 9, SemanticInfo::TypeUse)
-        << Use(103, 28, 8, SemanticInfo::FunctionUse)
-        << Use(104, 5, 9, SemanticInfo::TypeUse)
-        << Use(104, 28, 8, SemanticInfo::FunctionUse)
-        << Use(105, 5, 9, SemanticInfo::TypeUse)
-        << Use(105, 28, 8, SemanticInfo::FunctionUse)
-        << Use(106, 5, 9, SemanticInfo::TypeUse)
-        << Use(106, 28, 8, SemanticInfo::FunctionUse)
-        << Use(107, 5, 9, SemanticInfo::TypeUse)
-        << Use(107, 28, 8, SemanticInfo::FunctionUse)
-        << Use(108, 5, 9, SemanticInfo::TypeUse)
-        << Use(108, 28, 8, SemanticInfo::FunctionUse)
-        << Use(109, 5, 9, SemanticInfo::TypeUse)
-        << Use(109, 28, 8, SemanticInfo::FunctionUse)
-        << Use(110, 5, 9, SemanticInfo::TypeUse)
-        << Use(110, 28, 8, SemanticInfo::FunctionUse)
-        << Use(111, 5, 9, SemanticInfo::TypeUse)
-        << Use(111, 28, 8, SemanticInfo::FunctionUse)
-        << Use(112, 5, 9, SemanticInfo::TypeUse)
-        << Use(112, 28, 8, SemanticInfo::FunctionUse)
-        << Use(113, 5, 9, SemanticInfo::TypeUse)
-        << Use(113, 28, 8, SemanticInfo::FunctionUse)
-        << Use(114, 5, 9, SemanticInfo::TypeUse)
-        << Use(114, 28, 8, SemanticInfo::FunctionUse)
-        << Use(115, 5, 9, SemanticInfo::TypeUse)
-        << Use(115, 28, 8, SemanticInfo::FunctionUse)
-        << Use(116, 5, 9, SemanticInfo::TypeUse)
-        << Use(116, 28, 8, SemanticInfo::FunctionUse)
-        << Use(117, 5, 9, SemanticInfo::TypeUse)
-        << Use(117, 28, 8, SemanticInfo::FunctionUse)
-        << Use(118, 5, 9, SemanticInfo::TypeUse)
-        << Use(118, 28, 8, SemanticInfo::FunctionUse)
-        << Use(119, 5, 9, SemanticInfo::TypeUse)
-        << Use(119, 28, 8, SemanticInfo::FunctionUse)
-        << Use(120, 5, 9, SemanticInfo::TypeUse)
-        << Use(120, 28, 8, SemanticInfo::FunctionUse)
-        << Use(121, 5, 9, SemanticInfo::TypeUse)
-        << Use(121, 28, 8, SemanticInfo::FunctionUse)
-        << Use(122, 5, 9, SemanticInfo::TypeUse)
-        << Use(122, 28, 8, SemanticInfo::FunctionUse)
-        << Use(123, 5, 9, SemanticInfo::TypeUse)
-        << Use(123, 28, 8, SemanticInfo::FunctionUse)
-        << Use(124, 5, 9, SemanticInfo::TypeUse)
-        << Use(124, 28, 8, SemanticInfo::FunctionUse)
-        << Use(125, 5, 9, SemanticInfo::TypeUse)
-        << Use(125, 28, 8, SemanticInfo::FunctionUse)
-        << Use(126, 5, 9, SemanticInfo::TypeUse)
-        << Use(126, 28, 8, SemanticInfo::FunctionUse)
-        << Use(127, 5, 9, SemanticInfo::TypeUse)
-        << Use(127, 28, 8, SemanticInfo::FunctionUse)
-        << Use(128, 5, 9, SemanticInfo::TypeUse)
-        << Use(128, 28, 8, SemanticInfo::FunctionUse)
-        << Use(129, 5, 9, SemanticInfo::TypeUse)
-        << Use(129, 28, 8, SemanticInfo::FunctionUse)
-        << Use(130, 5, 9, SemanticInfo::TypeUse)
-        << Use(130, 28, 8, SemanticInfo::FunctionUse)
-        << Use(131, 5, 9, SemanticInfo::TypeUse)
-        << Use(131, 28, 8, SemanticInfo::FunctionUse)
-        << Use(132, 5, 9, SemanticInfo::TypeUse)
-        << Use(132, 28, 8, SemanticInfo::FunctionUse)
-        << Use(133, 5, 9, SemanticInfo::TypeUse)
-        << Use(133, 28, 8, SemanticInfo::FunctionUse)
-        << Use(134, 5, 9, SemanticInfo::TypeUse)
-        << Use(134, 28, 8, SemanticInfo::FunctionUse)
-        << Use(135, 5, 9, SemanticInfo::TypeUse)
-        << Use(135, 28, 8, SemanticInfo::FunctionUse)
-        << Use(136, 5, 9, SemanticInfo::TypeUse)
-        << Use(136, 28, 8, SemanticInfo::FunctionUse)
-        << Use(137, 5, 9, SemanticInfo::TypeUse)
-        << Use(137, 28, 8, SemanticInfo::FunctionUse)
-        << Use(138, 5, 9, SemanticInfo::TypeUse)
-        << Use(138, 28, 8, SemanticInfo::FunctionUse)
-        << Use(139, 5, 9, SemanticInfo::TypeUse)
-        << Use(139, 28, 8, SemanticInfo::FunctionUse)
-        << Use(140, 5, 9, SemanticInfo::TypeUse)
-        << Use(140, 28, 8, SemanticInfo::FunctionUse)
-        << Use(141, 5, 9, SemanticInfo::TypeUse)
-        << Use(141, 28, 8, SemanticInfo::FunctionUse)
-        << Use(142, 5, 9, SemanticInfo::TypeUse)
-        << Use(142, 28, 8, SemanticInfo::FunctionUse)
-        << Use(143, 5, 9, SemanticInfo::TypeUse)
-        << Use(143, 28, 8, SemanticInfo::FunctionUse)
-        << Use(144, 5, 9, SemanticInfo::TypeUse)
-        << Use(144, 28, 8, SemanticInfo::FunctionUse)
-        << Use(145, 5, 9, SemanticInfo::TypeUse)
-        << Use(145, 28, 8, SemanticInfo::FunctionUse)
-        << Use(146, 5, 9, SemanticInfo::TypeUse)
-        << Use(146, 28, 8, SemanticInfo::FunctionUse)
-        << Use(147, 5, 9, SemanticInfo::TypeUse)
-        << Use(147, 28, 8, SemanticInfo::FunctionUse)
-        << Use(148, 5, 9, SemanticInfo::TypeUse)
-        << Use(148, 28, 8, SemanticInfo::FunctionUse)
-        << Use(149, 5, 9, SemanticInfo::TypeUse)
-        << Use(149, 28, 8, SemanticInfo::FunctionUse)
-        << Use(150, 5, 9, SemanticInfo::TypeUse)
-        << Use(150, 28, 8, SemanticInfo::FunctionUse)
-        << Use(151, 5, 9, SemanticInfo::TypeUse)
-        << Use(151, 28, 8, SemanticInfo::FunctionUse)
-        << Use(152, 5, 9, SemanticInfo::TypeUse)
-        << Use(152, 28, 8, SemanticInfo::FunctionUse)
-        << Use(153, 5, 9, SemanticInfo::TypeUse)
-        << Use(153, 28, 8, SemanticInfo::FunctionUse)
-        << Use(154, 5, 9, SemanticInfo::TypeUse)
-        << Use(154, 28, 8, SemanticInfo::FunctionUse)
-        << Use(155, 5, 9, SemanticInfo::TypeUse)
-        << Use(155, 28, 8, SemanticInfo::FunctionUse)
-        << Use(156, 5, 9, SemanticInfo::TypeUse)
-        << Use(156, 28, 8, SemanticInfo::FunctionUse)
-        << Use(157, 5, 9, SemanticInfo::TypeUse)
-        << Use(157, 28, 8, SemanticInfo::FunctionUse)
-        << Use(158, 5, 9, SemanticInfo::TypeUse)
-        << Use(158, 28, 8, SemanticInfo::FunctionUse)
-        << Use(159, 5, 9, SemanticInfo::TypeUse)
-        << Use(159, 28, 8, SemanticInfo::FunctionUse)
-        << Use(160, 5, 9, SemanticInfo::TypeUse)
-        << Use(160, 28, 8, SemanticInfo::FunctionUse)
-        << Use(161, 5, 9, SemanticInfo::TypeUse)
-        << Use(161, 28, 8, SemanticInfo::FunctionUse)
-        << Use(162, 5, 9, SemanticInfo::TypeUse)
-        << Use(162, 28, 8, SemanticInfo::FunctionUse)
-        << Use(163, 5, 9, SemanticInfo::TypeUse)
-        << Use(163, 28, 8, SemanticInfo::FunctionUse)
-        << Use(164, 5, 9, SemanticInfo::TypeUse)
-        << Use(164, 28, 8, SemanticInfo::FunctionUse)
-        << Use(165, 5, 9, SemanticInfo::TypeUse)
-        << Use(165, 28, 8, SemanticInfo::FunctionUse)
-        << Use(166, 5, 9, SemanticInfo::TypeUse)
-        << Use(166, 28, 8, SemanticInfo::FunctionUse)
-        << Use(167, 5, 9, SemanticInfo::TypeUse)
-        << Use(167, 28, 8, SemanticInfo::FunctionUse)
-        << Use(168, 5, 9, SemanticInfo::TypeUse)
-        << Use(168, 28, 8, SemanticInfo::FunctionUse)
-        << Use(169, 5, 9, SemanticInfo::TypeUse)
-        << Use(169, 28, 8, SemanticInfo::FunctionUse)
-        << Use(170, 5, 9, SemanticInfo::TypeUse)
-        << Use(170, 28, 8, SemanticInfo::FunctionUse)
-        << Use(171, 5, 9, SemanticInfo::TypeUse)
-        << Use(171, 28, 8, SemanticInfo::FunctionUse)
-        << Use(172, 5, 9, SemanticInfo::TypeUse)
-        << Use(172, 28, 8, SemanticInfo::FunctionUse)
-        << Use(173, 5, 9, SemanticInfo::TypeUse)
-        << Use(173, 28, 8, SemanticInfo::FunctionUse)
-        << Use(174, 5, 9, SemanticInfo::TypeUse)
-        << Use(174, 28, 8, SemanticInfo::FunctionUse)
-        << Use(175, 5, 9, SemanticInfo::TypeUse)
-        << Use(175, 28, 8, SemanticInfo::FunctionUse)
-        << Use(176, 5, 9, SemanticInfo::TypeUse)
-        << Use(176, 28, 8, SemanticInfo::FunctionUse)
-        << Use(177, 5, 9, SemanticInfo::TypeUse)
-        << Use(177, 28, 8, SemanticInfo::FunctionUse)
-        << Use(178, 5, 9, SemanticInfo::TypeUse)
-        << Use(178, 28, 8, SemanticInfo::FunctionUse)
-        << Use(179, 5, 9, SemanticInfo::TypeUse)
-        << Use(179, 28, 8, SemanticInfo::FunctionUse)
-        << Use(180, 5, 9, SemanticInfo::TypeUse)
-        << Use(180, 28, 8, SemanticInfo::FunctionUse)
-        << Use(181, 5, 9, SemanticInfo::TypeUse)
-        << Use(181, 28, 8, SemanticInfo::FunctionUse)
-        << Use(182, 5, 9, SemanticInfo::TypeUse)
-        << Use(182, 28, 8, SemanticInfo::FunctionUse)
-        << Use(183, 5, 9, SemanticInfo::TypeUse)
-        << Use(183, 28, 8, SemanticInfo::FunctionUse)
-        << Use(184, 5, 9, SemanticInfo::TypeUse)
-        << Use(184, 28, 8, SemanticInfo::FunctionUse)
-        << Use(185, 5, 9, SemanticInfo::TypeUse)
-        << Use(185, 28, 8, SemanticInfo::FunctionUse)
-        << Use(186, 5, 9, SemanticInfo::TypeUse)
-        << Use(186, 28, 8, SemanticInfo::FunctionUse)
-        << Use(187, 5, 9, SemanticInfo::TypeUse)
-        << Use(187, 28, 8, SemanticInfo::FunctionUse)
-        << Use(188, 5, 9, SemanticInfo::TypeUse)
-        << Use(188, 28, 8, SemanticInfo::FunctionUse)
-        << Use(189, 5, 9, SemanticInfo::TypeUse)
-        << Use(189, 28, 8, SemanticInfo::FunctionUse)
-        << Use(190, 5, 9, SemanticInfo::TypeUse)
-        << Use(190, 28, 8, SemanticInfo::FunctionUse)
-        << Use(191, 5, 9, SemanticInfo::TypeUse)
-        << Use(191, 28, 8, SemanticInfo::FunctionUse)
-        << Use(192, 5, 9, SemanticInfo::TypeUse)
-        << Use(192, 28, 8, SemanticInfo::FunctionUse)
-        << Use(193, 5, 9, SemanticInfo::TypeUse)
-        << Use(193, 28, 8, SemanticInfo::FunctionUse)
-        << Use(194, 5, 9, SemanticInfo::TypeUse)
-        << Use(194, 28, 8, SemanticInfo::FunctionUse)
-        << Use(195, 5, 9, SemanticInfo::TypeUse)
-        << Use(195, 28, 8, SemanticInfo::FunctionUse)
-        << Use(196, 5, 9, SemanticInfo::TypeUse)
-        << Use(196, 28, 8, SemanticInfo::FunctionUse)
-        << Use(197, 5, 9, SemanticInfo::TypeUse)
-        << Use(197, 28, 8, SemanticInfo::FunctionUse)
-        << Use(198, 5, 9, SemanticInfo::TypeUse)
-        << Use(198, 28, 8, SemanticInfo::FunctionUse)
-        << Use(199, 5, 9, SemanticInfo::TypeUse)
-        << Use(199, 28, 8, SemanticInfo::FunctionUse)
-        << Use(200, 5, 9, SemanticInfo::TypeUse)
-        << Use(200, 28, 8, SemanticInfo::FunctionUse)
-        << Use(201, 5, 9, SemanticInfo::TypeUse)
-        << Use(201, 28, 8, SemanticInfo::FunctionUse)
-        << Use(202, 5, 9, SemanticInfo::TypeUse)
-        << Use(202, 28, 8, SemanticInfo::FunctionUse)
-        << Use(203, 5, 9, SemanticInfo::TypeUse)
-        << Use(203, 28, 8, SemanticInfo::FunctionUse)
-        << Use(204, 5, 9, SemanticInfo::TypeUse)
-        << Use(204, 28, 8, SemanticInfo::FunctionUse)
-        << Use(205, 5, 9, SemanticInfo::TypeUse)
-        << Use(205, 28, 8, SemanticInfo::FunctionUse)
-        << Use(206, 5, 9, SemanticInfo::TypeUse)
-        << Use(206, 28, 8, SemanticInfo::FunctionUse)
-        << Use(207, 5, 9, SemanticInfo::TypeUse)
-        << Use(207, 28, 8, SemanticInfo::FunctionUse)
-        << Use(208, 5, 9, SemanticInfo::TypeUse)
-        << Use(208, 28, 8, SemanticInfo::FunctionUse)
-        << Use(209, 5, 9, SemanticInfo::TypeUse)
-        << Use(209, 28, 8, SemanticInfo::FunctionUse)
-        << Use(210, 5, 9, SemanticInfo::TypeUse)
-        << Use(210, 28, 8, SemanticInfo::FunctionUse)
-        << Use(211, 5, 9, SemanticInfo::TypeUse)
-        << Use(211, 28, 8, SemanticInfo::FunctionUse)
-        << Use(212, 5, 9, SemanticInfo::TypeUse)
-        << Use(212, 28, 8, SemanticInfo::FunctionUse)
-        << Use(213, 5, 9, SemanticInfo::TypeUse)
-        << Use(213, 28, 8, SemanticInfo::FunctionUse)
-        << Use(214, 5, 9, SemanticInfo::TypeUse)
-        << Use(214, 28, 8, SemanticInfo::FunctionUse)
-        << Use(215, 5, 9, SemanticInfo::TypeUse)
-        << Use(215, 28, 8, SemanticInfo::FunctionUse)
-        << Use(216, 5, 9, SemanticInfo::TypeUse)
-        << Use(216, 28, 8, SemanticInfo::FunctionUse)
-        << Use(217, 5, 9, SemanticInfo::TypeUse)
-        << Use(217, 28, 8, SemanticInfo::FunctionUse)
-        << Use(218, 5, 9, SemanticInfo::TypeUse)
-        << Use(218, 28, 8, SemanticInfo::FunctionUse)
-        << Use(219, 5, 9, SemanticInfo::TypeUse)
-        << Use(219, 28, 8, SemanticInfo::FunctionUse)
-        << Use(220, 5, 9, SemanticInfo::TypeUse)
-        << Use(220, 28, 8, SemanticInfo::FunctionUse)
-        << Use(221, 5, 9, SemanticInfo::TypeUse)
-        << Use(221, 28, 8, SemanticInfo::FunctionUse)
-        << Use(222, 5, 9, SemanticInfo::TypeUse)
-        << Use(222, 28, 8, SemanticInfo::FunctionUse)
-        << Use(223, 5, 9, SemanticInfo::TypeUse)
-        << Use(223, 28, 8, SemanticInfo::FunctionUse)
-        << Use(224, 5, 9, SemanticInfo::TypeUse)
-        << Use(224, 28, 8, SemanticInfo::FunctionUse)
-        << Use(225, 5, 9, SemanticInfo::TypeUse)
-        << Use(225, 28, 8, SemanticInfo::FunctionUse)
-        << Use(226, 5, 9, SemanticInfo::TypeUse)
-        << Use(226, 28, 8, SemanticInfo::FunctionUse)
-        << Use(227, 5, 9, SemanticInfo::TypeUse)
-        << Use(227, 28, 8, SemanticInfo::FunctionUse)
-        << Use(228, 5, 9, SemanticInfo::TypeUse)
-        << Use(228, 28, 8, SemanticInfo::FunctionUse)
-        << Use(229, 5, 9, SemanticInfo::TypeUse)
-        << Use(229, 28, 8, SemanticInfo::FunctionUse)
-        << Use(230, 5, 9, SemanticInfo::TypeUse)
-        << Use(230, 28, 8, SemanticInfo::FunctionUse)
-        << Use(231, 5, 9, SemanticInfo::TypeUse)
-        << Use(231, 28, 8, SemanticInfo::FunctionUse)
-        << Use(232, 5, 9, SemanticInfo::TypeUse)
-        << Use(232, 28, 8, SemanticInfo::FunctionUse)
-        << Use(233, 5, 9, SemanticInfo::TypeUse)
-        << Use(233, 28, 8, SemanticInfo::FunctionUse)
-        << Use(234, 5, 9, SemanticInfo::TypeUse)
-        << Use(234, 28, 8, SemanticInfo::FunctionUse)
-        << Use(235, 5, 9, SemanticInfo::TypeUse)
-        << Use(235, 28, 8, SemanticInfo::FunctionUse)
-        << Use(236, 5, 9, SemanticInfo::TypeUse)
-        << Use(236, 28, 8, SemanticInfo::FunctionUse)
-        << Use(237, 5, 9, SemanticInfo::TypeUse)
-        << Use(237, 28, 8, SemanticInfo::FunctionUse)
-        << Use(238, 5, 9, SemanticInfo::TypeUse)
-        << Use(238, 28, 8, SemanticInfo::FunctionUse)
-        << Use(239, 5, 9, SemanticInfo::TypeUse)
-        << Use(239, 28, 8, SemanticInfo::FunctionUse)
-        << Use(240, 5, 9, SemanticInfo::TypeUse)
-        << Use(240, 28, 8, SemanticInfo::FunctionUse)
-        << Use(241, 5, 9, SemanticInfo::TypeUse)
-        << Use(241, 28, 8, SemanticInfo::FunctionUse)
-        << Use(242, 5, 9, SemanticInfo::TypeUse)
-        << Use(242, 28, 8, SemanticInfo::FunctionUse)
-        << Use(243, 5, 9, SemanticInfo::TypeUse)
-        << Use(243, 28, 8, SemanticInfo::FunctionUse)
-        << Use(244, 5, 9, SemanticInfo::TypeUse)
-        << Use(244, 28, 8, SemanticInfo::FunctionUse)
-        << Use(245, 5, 9, SemanticInfo::TypeUse)
-        << Use(245, 28, 8, SemanticInfo::FunctionUse)
-        << Use(246, 5, 9, SemanticInfo::TypeUse)
-        << Use(246, 28, 8, SemanticInfo::FunctionUse)
-        << Use(247, 5, 9, SemanticInfo::TypeUse)
-        << Use(247, 28, 8, SemanticInfo::FunctionUse)
+        << Use(1, 17, 1, CppHighlightingSupport::TypeUse)
+        << Use(2, 7, 9, CppHighlightingSupport::TypeUse)
+        << Use(5, 12, 1, CppHighlightingSupport::TypeUse)
+        << Use(5, 15, 8, CppHighlightingSupport::FunctionUse)
+        << Use(8, 6, 3, CppHighlightingSupport::FunctionUse)
+        << Use(10, 6, 3, CppHighlightingSupport::FunctionUse)
+        << Use(12, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(12, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(13, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(13, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(14, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(14, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(15, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(15, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(16, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(16, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(17, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(17, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(18, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(18, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(19, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(19, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(20, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(20, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(21, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(21, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(22, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(22, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(23, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(23, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(24, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(24, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(25, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(25, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(26, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(26, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(27, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(27, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(28, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(28, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(29, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(29, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(30, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(30, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(31, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(31, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(32, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(32, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(33, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(33, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(34, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(34, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(35, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(35, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(36, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(36, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(37, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(37, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(38, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(38, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(39, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(39, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(40, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(40, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(41, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(41, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(42, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(42, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(43, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(43, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(44, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(44, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(45, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(45, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(46, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(46, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(47, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(47, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(48, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(48, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(49, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(49, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(50, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(50, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(51, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(51, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(52, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(52, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(53, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(53, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(54, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(54, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(55, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(55, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(56, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(56, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(57, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(57, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(58, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(58, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(59, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(59, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(60, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(60, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(61, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(61, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(62, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(62, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(63, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(63, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(64, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(64, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(65, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(65, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(66, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(66, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(67, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(67, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(68, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(68, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(69, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(69, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(70, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(70, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(71, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(71, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(72, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(72, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(73, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(73, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(74, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(74, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(75, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(75, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(76, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(76, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(77, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(77, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(78, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(78, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(79, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(79, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(80, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(80, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(81, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(81, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(82, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(82, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(83, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(83, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(84, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(84, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(85, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(85, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(86, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(86, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(87, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(87, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(88, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(88, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(89, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(89, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(90, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(90, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(91, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(91, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(92, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(92, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(93, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(93, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(94, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(94, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(95, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(95, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(96, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(96, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(97, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(97, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(98, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(98, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(99, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(99, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(100, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(100, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(101, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(101, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(102, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(102, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(103, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(103, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(104, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(104, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(105, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(105, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(106, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(106, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(107, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(107, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(108, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(108, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(109, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(109, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(110, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(110, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(111, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(111, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(112, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(112, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(113, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(113, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(114, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(114, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(115, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(115, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(116, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(116, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(117, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(117, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(118, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(118, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(119, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(119, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(120, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(120, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(121, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(121, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(122, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(122, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(123, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(123, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(124, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(124, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(125, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(125, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(126, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(126, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(127, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(127, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(128, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(128, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(129, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(129, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(130, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(130, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(131, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(131, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(132, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(132, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(133, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(133, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(134, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(134, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(135, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(135, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(136, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(136, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(137, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(137, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(138, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(138, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(139, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(139, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(140, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(140, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(141, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(141, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(142, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(142, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(143, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(143, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(144, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(144, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(145, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(145, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(146, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(146, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(147, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(147, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(148, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(148, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(149, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(149, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(150, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(150, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(151, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(151, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(152, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(152, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(153, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(153, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(154, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(154, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(155, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(155, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(156, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(156, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(157, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(157, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(158, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(158, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(159, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(159, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(160, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(160, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(161, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(161, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(162, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(162, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(163, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(163, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(164, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(164, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(165, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(165, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(166, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(166, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(167, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(167, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(168, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(168, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(169, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(169, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(170, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(170, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(171, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(171, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(172, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(172, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(173, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(173, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(174, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(174, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(175, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(175, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(176, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(176, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(177, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(177, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(178, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(178, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(179, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(179, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(180, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(180, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(181, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(181, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(182, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(182, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(183, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(183, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(184, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(184, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(185, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(185, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(186, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(186, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(187, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(187, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(188, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(188, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(189, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(189, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(190, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(190, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(191, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(191, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(192, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(192, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(193, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(193, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(194, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(194, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(195, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(195, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(196, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(196, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(197, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(197, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(198, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(198, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(199, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(199, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(200, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(200, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(201, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(201, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(202, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(202, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(203, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(203, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(204, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(204, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(205, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(205, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(206, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(206, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(207, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(207, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(208, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(208, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(209, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(209, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(210, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(210, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(211, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(211, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(212, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(212, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(213, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(213, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(214, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(214, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(215, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(215, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(216, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(216, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(217, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(217, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(218, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(218, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(219, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(219, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(220, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(220, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(221, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(221, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(222, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(222, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(223, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(223, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(224, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(224, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(225, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(225, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(226, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(226, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(227, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(227, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(228, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(228, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(229, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(229, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(230, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(230, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(231, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(231, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(232, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(232, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(233, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(233, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(234, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(234, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(235, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(235, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(236, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(236, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(237, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(237, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(238, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(238, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(239, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(239, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(240, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(240, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(241, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(241, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(242, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(242, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(243, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(243, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(244, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(244, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(245, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(245, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(246, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(246, 28, 8, CppHighlightingSupport::FunctionUse)
+        << Use(247, 5, 9, CppHighlightingSupport::TypeUse)
+        << Use(247, 28, 8, CppHighlightingSupport::FunctionUse)
         ;
 
     TestData::check(source, expectedUses);
@@ -1369,23 +1370,23 @@ void tst_CheckSymbols::operatorAsteriskOfNestedClassOfTemplateClass_QTCREATORBUG
         ;
 
     const QList<Use> expectedUses = QList<Use>()
-            << Use(1, 8, 3, SemanticInfo::TypeUse)
-            << Use(1, 18, 3, SemanticInfo::FieldUse)
-            << Use(3, 16, 1, SemanticInfo::TypeUse)
-            << Use(4, 8, 5, SemanticInfo::TypeUse)
-            << Use(6, 10, 6, SemanticInfo::TypeUse)
-            << Use(8, 11, 1, SemanticInfo::TypeUse)
-            << Use(8, 14, 8, SemanticInfo::FunctionUse)
-            << Use(8, 35, 1, SemanticInfo::FieldUse)
-            << Use(9, 5, 1, SemanticInfo::TypeUse)
-            << Use(9, 7, 1, SemanticInfo::FieldUse)
-            << Use(13, 6, 3, SemanticInfo::FunctionUse)
-            << Use(15, 3, 5, SemanticInfo::TypeUse)
-            << Use(15, 9, 3, SemanticInfo::TypeUse)
-            << Use(15, 15, 6, SemanticInfo::TypeUse)
-            << Use(15, 22, 6, SemanticInfo::LocalUse)
-            << Use(16, 5, 6, SemanticInfo::LocalUse)
-            << Use(16, 13, 3, SemanticInfo::FieldUse)
+            << Use(1, 8, 3, CppHighlightingSupport::TypeUse)
+            << Use(1, 18, 3, CppHighlightingSupport::FieldUse)
+            << Use(3, 16, 1, CppHighlightingSupport::TypeUse)
+            << Use(4, 8, 5, CppHighlightingSupport::TypeUse)
+            << Use(6, 10, 6, CppHighlightingSupport::TypeUse)
+            << Use(8, 11, 1, CppHighlightingSupport::TypeUse)
+            << Use(8, 14, 8, CppHighlightingSupport::FunctionUse)
+            << Use(8, 35, 1, CppHighlightingSupport::FieldUse)
+            << Use(9, 5, 1, CppHighlightingSupport::TypeUse)
+            << Use(9, 7, 1, CppHighlightingSupport::FieldUse)
+            << Use(13, 6, 3, CppHighlightingSupport::FunctionUse)
+            << Use(15, 3, 5, CppHighlightingSupport::TypeUse)
+            << Use(15, 9, 3, CppHighlightingSupport::TypeUse)
+            << Use(15, 15, 6, CppHighlightingSupport::TypeUse)
+            << Use(15, 22, 6, CppHighlightingSupport::LocalUse)
+            << Use(16, 5, 6, CppHighlightingSupport::LocalUse)
+            << Use(16, 13, 3, CppHighlightingSupport::FieldUse)
         ;
 
     TestData::check(source, expectedUses);
@@ -1405,17 +1406,18 @@ void tst_CheckSymbols::test_checksymbols_templated_functions()
             ;
 
     const QList<Use> expectedUses = QList<Use>()
-        << Use(1, 8, 1, SemanticInfo::TypeUse)
-        << Use(2, 8, 1, SemanticInfo::TypeUse)
-        << Use(3, 23, 1, SemanticInfo::TypeUse)
-        << Use(3, 30, 1, SemanticInfo::FunctionUse)
-        << Use(4, 10, 1, SemanticInfo::FunctionUse)
-        << Use(5, 9, 1, SemanticInfo::FunctionUse)
-        << Use(5, 11, 1, SemanticInfo::TypeUse)
-        << Use(6, 15, 1, SemanticInfo::FunctionUse)
-        << Use(6, 17, 1, SemanticInfo::TypeUse)
+        << Use(1, 8, 1, CppHighlightingSupport::TypeUse)
+        << Use(2, 8, 1, CppHighlightingSupport::TypeUse)
+        << Use(3, 23, 1, CppHighlightingSupport::TypeUse)
+        << Use(3, 30, 1, CppHighlightingSupport::FunctionUse)
+        << Use(4, 10, 1, CppHighlightingSupport::FunctionUse)
+        << Use(5, 9, 1, CppHighlightingSupport::FunctionUse)
+        << Use(5, 11, 1, CppHighlightingSupport::TypeUse)
+        << Use(6, 15, 1, CppHighlightingSupport::FunctionUse)
+        << Use(6, 17, 1, CppHighlightingSupport::TypeUse)
         ;
 
+    TestData::check(source, expectedUses);
 }
 
 void tst_CheckSymbols::test_checksymbols_QTCREATORBUG9098()
@@ -1440,18 +1442,18 @@ void tst_CheckSymbols::test_checksymbols_QTCREATORBUG9098()
             ;
 
     const QList<Use> expectedUses = QList<Use>()
-            << Use(1, 20, 1, SemanticInfo::TypeUse)
-            << Use(2, 7, 1, SemanticInfo::TypeUse)
-            << Use(5, 7, 1, SemanticInfo::TypeUse)
-            << Use(5, 10, 1, SemanticInfo::FieldUse)
-            << Use(7, 20, 1, SemanticInfo::TypeUse)
-            << Use(8, 7, 1, SemanticInfo::TypeUse)
-            << Use(11, 5, 1, SemanticInfo::TypeUse)
-            << Use(11, 7, 1, SemanticInfo::TypeUse)
-            << Use(11, 10, 1, SemanticInfo::FieldUse)
-            << Use(12, 10, 3, SemanticInfo::FunctionUse)
-            << Use(14, 9, 1, SemanticInfo::FieldUse)
-            << Use(14, 11, 1, SemanticInfo::FieldUse)
+            << Use(1, 20, 1, CppHighlightingSupport::TypeUse)
+            << Use(2, 7, 1, CppHighlightingSupport::TypeUse)
+            << Use(5, 7, 1, CppHighlightingSupport::TypeUse)
+            << Use(5, 10, 1, CppHighlightingSupport::FieldUse)
+            << Use(7, 20, 1, CppHighlightingSupport::TypeUse)
+            << Use(8, 7, 1, CppHighlightingSupport::TypeUse)
+            << Use(11, 5, 1, CppHighlightingSupport::TypeUse)
+            << Use(11, 7, 1, CppHighlightingSupport::TypeUse)
+            << Use(11, 10, 1, CppHighlightingSupport::FieldUse)
+            << Use(12, 10, 3, CppHighlightingSupport::FunctionUse)
+            << Use(14, 9, 1, CppHighlightingSupport::FieldUse)
+            << Use(14, 11, 1, CppHighlightingSupport::FieldUse)
             ;
 
     TestData::check(source, expectedUses);
author	Erik Verbruggen <erik.verbruggen@digia.com>	2013-04-16 16:48:10 +0200
committer	Erik Verbruggen <erik.verbruggen@digia.com>	2013-04-18 12:25:24 +0200
commit	4b0f70f4c9d52574edc80dbff441a2a5fa1a7f80 (patch)
tree	41ae389add1d6cb415a3ca7ebe47e6e64add4629
parent	6a4310a44afc0396b462f9ac9f3524161155645a (diff)
download	qt-creator-4b0f70f4c9d52574edc80dbff441a2a5fa1a7f80.tar.gz