From 270defaf59b4dcc39476cf6de816bd27833c1775 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 6 Jan 2010 16:38:10 +0100 Subject: [PATCH] debugger: go back to explicitly named pointers --- src/plugins/debugger/gdb/gdbengine.cpp | 2 +- src/plugins/debugger/watchhandler.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 6ff1cb08c87..9024e1c87b5 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -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; diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index ae12376acb1..6c0b721aac7 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -300,6 +300,7 @@ QString WatchData::toToolTip() const QString res; QTextStream str(&res); str << ""; + formatToolTipRow(str, WatchHandler::tr("Name"), name); formatToolTipRow(str, WatchHandler::tr("Expression"), exp); formatToolTipRow(str, WatchHandler::tr("Type"), typeToolTip(*this)); QString val = value; @@ -782,8 +783,8 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const case Qt::DisplayRole: { switch (idx.column()) { case 0: - if (data.name == QLatin1String("*") && item->parent) - return QLatin1String("*") + item->parent->name; + //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);