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

debugger: use '*' as name for all pointers, add pointee only for display purposes

Browse Source
This commit is contained in:
hjk
2010-01-06 13:30:11 +01:00
parent 6ced1c3e75
commit 85b4b826ab
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -3938,7 +3938,7 @@ void GdbEngine::handleVarListChildrenHelper(const GdbMi &item,
if (data.type == data.name) {
if (isPointerType(parent.type)) {
data.exp = "*(" + parent.exp + ')';
data.name = _("*") + parent.name;
data.name = _("*"); // + parent.name;
} else {
// A type we derive from? gdb crashes when creating variables here
data.exp = parent.exp;

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

@@ -89,7 +89,7 @@ public:
{ parent = 0; }
void setData(const WatchData &data)
{ static_cast<WatchData &>(*this) = data; }
{ static_cast<WatchData &>(*this) = data; parent = 0; }
WatchItem *parent;
QList<WatchItem *> children; // fetched children
@@ -775,12 +775,15 @@ void WatchModel::emitDataChanged(int column, const QModelIndex &parentIndex)
QVariant WatchModel::data(const QModelIndex &idx, int role) const
{
const WatchItem &data = *watchItem(idx);
const WatchItem *item = watchItem(idx);
const WatchItem &data = *item;
switch (role) {
case Qt::DisplayRole: {
switch (idx.column()) {
case 0:
if (data.name == QLatin1String("*") && item->parent)
return QLatin1String("*") + item->parent->name;
return data.name;
case 1: {
int format = m_handler->m_individualFormats.value(data.iname, -1);