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, 3 deletions

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