From 40c4f7847f7dd86964b1ca53b0d1569e8623fd37 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@theqtcompany.com>
Date: Mon, 7 Mar 2016 11:59:01 +0100
Subject: [PATCH] TextEditor: Add global variable text styles

Change-Id: I088dc484b6a4ace79609ca7fcc4145344ccea5a9
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
---
 share/qtcreator/styles/dark.xml                               | 1 +
 share/qtcreator/styles/inkpot.xml                             | 1 +
 src/plugins/clangcodemodel/clanghighlightingmarksreporter.cpp | 2 ++
 src/plugins/texteditor/texteditorconstants.cpp                | 1 +
 src/plugins/texteditor/texteditorconstants.h                  | 1 +
 src/plugins/texteditor/texteditorsettings.cpp                 | 1 +
 6 files changed, 7 insertions(+)

diff --git a/share/qtcreator/styles/dark.xml b/share/qtcreator/styles/dark.xml
index e8719c10791..4a605d3f028 100644
--- a/share/qtcreator/styles/dark.xml
+++ b/share/qtcreator/styles/dark.xml
@@ -15,6 +15,7 @@
   <style name="Doxygen.Tag" foreground="#00a0a0"/>
   <style name="Field"/>
   <style name="Function"/>
+  <style name="Global"/>
   <style name="Keyword" foreground="#ffff55"/>
   <style name="PrimitiveType" foreground="#ffff55"/>
   <style name="Label" foreground="#ffff55"/>
diff --git a/share/qtcreator/styles/inkpot.xml b/share/qtcreator/styles/inkpot.xml
index 6253ec67746..65336e86bf9 100644
--- a/share/qtcreator/styles/inkpot.xml
+++ b/share/qtcreator/styles/inkpot.xml
@@ -20,6 +20,7 @@
   <style name="Doxygen.Tag" foreground="#4e5ab3"/>
   <style name="Field" bold="true"/>
   <style name="Function"/>
+  <style name="Global"/>
   <style name="Keyword" foreground="#808bed"/>
   <style name="PrimitiveType" foreground="#808bed"/>
   <style name="Label" foreground="#e76000"/>
diff --git a/src/plugins/clangcodemodel/clanghighlightingmarksreporter.cpp b/src/plugins/clangcodemodel/clanghighlightingmarksreporter.cpp
index 5d29ff65f5f..ccddbc978f9 100644
--- a/src/plugins/clangcodemodel/clanghighlightingmarksreporter.cpp
+++ b/src/plugins/clangcodemodel/clanghighlightingmarksreporter.cpp
@@ -48,6 +48,8 @@ TextEditor::TextStyle toTextStyle(ClangBackEnd::HighlightingType type)
             return TextEditor::C_LOCAL;
         case HighlightingType::Field:
             return TextEditor::C_FIELD;
+        case HighlightingType::GlobalVariable:
+            return TextEditor::C_GLOBAL;
         case HighlightingType::Enumeration:
             return TextEditor::C_ENUMERATION;
         case HighlightingType::Label:
diff --git a/src/plugins/texteditor/texteditorconstants.cpp b/src/plugins/texteditor/texteditorconstants.cpp
index b638ff4d17b..7325030306d 100644
--- a/src/plugins/texteditor/texteditorconstants.cpp
+++ b/src/plugins/texteditor/texteditorconstants.cpp
@@ -52,6 +52,7 @@ const char *nameForStyle(TextStyle style)
     case C_STRING:              return "String";
     case C_TYPE:                return "Type";
     case C_LOCAL:               return "Local";
+    case C_GLOBAL:              return "Global";
     case C_FIELD:               return "Field";
     // TODO: Rename "Static" to "Enumeration" in next major update,
     // because renaming here would break styles defined by the user.
diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h
index ff69f45cb51..354ff5f2520 100644
--- a/src/plugins/texteditor/texteditorconstants.h
+++ b/src/plugins/texteditor/texteditorconstants.h
@@ -51,6 +51,7 @@ enum TextStyle : quint8 {
     C_STRING,
     C_TYPE,
     C_LOCAL,
+    C_GLOBAL,
     C_FIELD,
     C_ENUMERATION,
     C_VIRTUAL_METHOD,
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index f47f4eceb1d..b1188bf30f8 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -157,6 +157,7 @@ TextEditorSettings::TextEditorSettings(QObject *parent)
     formatDescr.emplace_back(C_LOCAL, tr("Local"), tr("Local variables."));
     formatDescr.emplace_back(C_FIELD, tr("Field"),
                              tr("Class' data members."), Qt::darkRed);
+    formatDescr.emplace_back(C_GLOBAL, tr("Global"), tr("Global variables."));
     formatDescr.emplace_back(C_ENUMERATION, tr("Enumeration"),
                              tr("Applied to enumeration items."), Qt::darkMagenta);