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

debugger: make original value of automatically dereferenced pointer accessible

Browse Source
This commit is contained in:
hjk
2011-04-06 18:39:56 +02:00
parent 5a2c64b482
commit cd9aec6df9
6 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -641,6 +641,10 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
case 1:
result = removeInitialNamespace(truncateValue(
formattedValue(data, itemFormat(data))), ns);
if (data.origAddress) {
result += QLatin1String(" @");
result += QString::fromLatin1(data.hexOrigAddress());
}
break;
case 2:
result = removeNamespaces(displayType(data), ns);
@@ -692,16 +696,16 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
return m_handler->m_expandedINames.contains(data.iname);
case LocalsTypeFormatListRole: {
if (isIntType(data.type) && data.type != "bool")
return QStringList() << tr("decimal") << tr("hexadecimal")
<< tr("binary") << tr("octal");
if (data.type.endsWith('*'))
if (data.origAddress || data.type.endsWith('*'))
return QStringList()
<< tr("Raw pointer")
<< tr("Latin1 string")
<< tr("UTF8 string")
<< tr("UTF16 string")
<< tr("UCS4 string");
if (isIntType(data.type) && data.type != "bool")
return QStringList() << tr("decimal") << tr("hexadecimal")
<< tr("binary") << tr("octal");
// Hack: Compensate for namespaces.
QString type = data.type;
int pos = type.indexOf("::Q");