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

Debugger: Fix up titles/tooltips of memory views.

Browse Source
This commit is contained in:
Friedemann Kleint
2011-04-21 09:10:31 +02:00
parent dd0203e921
commit 5e5e533764
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -626,7 +626,7 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
}
case Qt::DisplayRole: {
const QByteArray ns = engine()->qtNamespace();
const QByteArray qtNameSpace = engine()->qtNamespace();
QString result;
switch (idx.column()) {
case 0:
@@ -635,18 +635,18 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
else if (data.name == QLatin1String("*") && item->parent)
result = QLatin1Char('*') + item->parent->name;
else
result = removeInitialNamespace(data.name, ns);
result = removeInitialNamespace(data.name, qtNameSpace);
break;
case 1:
result = removeInitialNamespace(truncateValue(
formattedValue(data, itemFormat(data))), ns);
formattedValue(data, itemFormat(data))), qtNameSpace);
if (data.referencingAddress) {
result += QLatin1String(" @");
result += QString::fromLatin1(data.hexAddress());
}
break;
case 2:
result = removeNamespaces(displayType(data), ns);
result = removeNamespaces(displayType(data), qtNameSpace);
break;
default:
break;
@@ -722,7 +722,10 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
type = type.left(pos);
return m_handler->m_reportedTypeFormats.value(type);
}
case LocalsTypeRole:
return removeNamespaces(displayType(data), engine()->qtNamespace());
case LocalsRawTypeRole:
return QString::fromLatin1(data.type);
case LocalsTypeFormatRole:
return m_handler->m_typeFormats.value(data.type, -1);