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>

1 files changed, 15 insertions, 14 deletions

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