feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Rename WatchItem::{color->valueColor}

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

Change-Id: I1dd63ae21469ec784aefa278d379f819280067d9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-03-16 13:14:28 +01:00
parent f5498e9fdf
commit 51edafece5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/debuggertooltipmanager.cpp
View File

@@ -208,7 +208,7 @@ public:
QString value; QString value;
QString type; QString type;
QString expression; QString expression;
QColor color; QColor valueColor;
bool expandable; bool expandable;
QByteArray iname; QByteArray iname;
}; };
@@ -219,7 +219,7 @@ ToolTipWatchItem::ToolTipWatchItem(WatchItem *item)
value = item->displayValue(); value = item->displayValue();
type = item->displayType(); type = item->displayType();
iname = item->d.iname; iname = item->d.iname;
color = item->color(); valueColor = item->valueColor();
expandable = item->d.hasChildren; expandable = item->d.hasChildren;
expression = item->expression(); expression = item->expression();
foreach (TreeItem *child, item->children()) foreach (TreeItem *child, item->children())
@@ -303,7 +303,7 @@ QVariant ToolTipWatchItem::data(int column, int role) const
case Qt::ForegroundRole: case Qt::ForegroundRole:
if (model() && static_cast<ToolTipModel *>(model())->m_enabled) { if (model() && static_cast<ToolTipModel *>(model())->m_enabled) {
if (column == 1) if (column == 1)
return color; return valueColor;
return QVariant(); return QVariant();
} }
return QColor(140, 140, 140); return QColor(140, 140, 140);

4
src/plugins/debugger/watchhandler.cpp
View File

@@ -721,7 +721,7 @@ QString WatchItem::displayType() const
return result; return result;
} }
QColor WatchItem::color() const QColor WatchItem::valueColor() const
{ {
static const QColor red(200, 0, 0); static const QColor red(200, 0, 0);
static const QColor gray(140, 140, 140); static const QColor gray(140, 140, 140);
@@ -783,7 +783,7 @@ QVariant WatchItem::data(int column, int role) const
case Qt::ForegroundRole: case Qt::ForegroundRole:
if (column == 1) if (column == 1)
return color(); return valueColor();
case LocalsExpressionRole: case LocalsExpressionRole:
return expression(); return expression();

2
src/plugins/debugger/watchhandler.h
View File

@@ -73,7 +73,7 @@ public:
QVariant editValue() const; QVariant editValue() const;
int editType() const; int editType() const;
QColor color() const; QColor valueColor() const;
int requestedFormat() const; int requestedFormat() const;
void showInEditorHelper(QString *contents, int depth) const; void showInEditorHelper(QString *contents, int depth) const;