From 51edafece5b4a2bbf163d131ae606e38af00f895 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Mon, 16 Mar 2015 13:14:28 +0100
Subject: [PATCH] Debugger: Rename WatchItem::{color->valueColor}

It's the color of the value field, not of the whole item.

Change-Id: I1dd63ae21469ec784aefa278d379f819280067d9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
 src/plugins/debugger/debuggertooltipmanager.cpp | 6 +++---
 src/plugins/debugger/watchhandler.cpp           | 4 ++--
 src/plugins/debugger/watchhandler.h             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp
index 5eb5c59883e..fc1bd3626b5 100644
--- a/src/plugins/debugger/debuggertooltipmanager.cpp
+++ b/src/plugins/debugger/debuggertooltipmanager.cpp
@@ -208,7 +208,7 @@ public:
     QString value;
     QString type;
     QString expression;
-    QColor color;
+    QColor valueColor;
     bool expandable;
     QByteArray iname;
 };
@@ -219,7 +219,7 @@ ToolTipWatchItem::ToolTipWatchItem(WatchItem *item)
     value = item->displayValue();
     type = item->displayType();
     iname = item->d.iname;
-    color = item->color();
+    valueColor = item->valueColor();
     expandable = item->d.hasChildren;
     expression = item->expression();
     foreach (TreeItem *child, item->children())
@@ -303,7 +303,7 @@ QVariant ToolTipWatchItem::data(int column, int role) const
         case Qt::ForegroundRole:
             if (model() && static_cast<ToolTipModel *>(model())->m_enabled) {
                 if (column == 1)
-                    return color;
+                    return valueColor;
                 return QVariant();
             }
             return QColor(140, 140, 140);
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index dcf621f738c..1c00848b928 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -721,7 +721,7 @@ QString WatchItem::displayType() const
     return result;
 }
 
-QColor WatchItem::color() const
+QColor WatchItem::valueColor() const
 {
     static const QColor red(200, 0, 0);
     static const QColor gray(140, 140, 140);
@@ -783,7 +783,7 @@ QVariant WatchItem::data(int column, int role) const
 
         case Qt::ForegroundRole:
             if (column == 1)
-                return color();
+                return valueColor();
 
         case LocalsExpressionRole:
             return expression();
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index 03ecdbf7696..d97dffd4703 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -73,7 +73,7 @@ public:
 
     QVariant editValue() const;
     int editType() const;
-    QColor color() const;
+    QColor valueColor() const;
 
     int requestedFormat() const;
     void showInEditorHelper(QString *contents, int depth) const;