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

Debugger: Remove unusued WatchData::displayType member

Browse Source 
Change-Id: I475c5f6ee90434a6e85342d8bb71bd10a04dd27b
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
hjk
2015-12-16 17:17:38 +01:00
parent 86f3194cc1
commit beb561b8cc
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/debugger/watchdata.cpp
View File

@@ -319,8 +319,6 @@ QString WatchData::toToolTip() const
formatToolTipRow(str, tr("Name"), name); formatToolTipRow(str, tr("Name"), name);
formatToolTipRow(str, tr("Expression"), QLatin1String(exp)); formatToolTipRow(str, tr("Expression"), QLatin1String(exp));
formatToolTipRow(str, tr("Internal Type"), QLatin1String(type)); formatToolTipRow(str, tr("Internal Type"), QLatin1String(type));
if (!displayedType.isEmpty())
formatToolTipRow(str, tr("Displayed Type"), displayedType);
bool ok; bool ok;
const quint64 intValue = value.toULongLong(&ok); const quint64 intValue = value.toULongLong(&ok);
if (ok && intValue) { if (ok && intValue) {
@@ -445,19 +443,12 @@ static void setWatchDataSize(WatchData &data, const GdbMi &mi)
} }
} }
// Find the "type" and "displayedtype" children of root and set up type.
void WatchData::updateType(const GdbMi &item) void WatchData::updateType(const GdbMi &item)
{ {
if (item.isValid()) if (item.isValid())
setType(item.data()); setType(item.data());
} }
void WatchData::updateDisplayedType(const GdbMi &item)
{
if (item.isValid())
displayedType = QString::fromLatin1(item.data());
}
// Utilities to decode string data returned by the dumper helpers. // Utilities to decode string data returned by the dumper helpers.
template <class T> template <class T>

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

@@ -98,7 +98,6 @@ public:
void updateValue(const GdbMi &item); void updateValue(const GdbMi &item);
void updateChildCount(const GdbMi &mi); void updateChildCount(const GdbMi &mi);
void updateType(const GdbMi &item); void updateType(const GdbMi &item);
void updateDisplayedType(const GdbMi &item);
public: public:
qint64 id; // Token for the engine for internal mapping qint64 id; // Token for the engine for internal mapping
@@ -111,7 +110,6 @@ public:
DebuggerDisplay editformat; // Format of displayed value DebuggerDisplay editformat; // Format of displayed value
DebuggerEncoding editencoding; // Encoding of displayed value DebuggerEncoding editencoding; // Encoding of displayed value
QByteArray type; // Type for further processing QByteArray type; // Type for further processing
QString displayedType; // Displayed type (optional)
quint64 address; // Displayed address of the actual object quint64 address; // Displayed address of the actual object
quint64 origaddr; // Address of the pointer referencing this item (gdb auto-deref) quint64 origaddr; // Address of the pointer referencing this item (gdb auto-deref)
uint size; // Size uint size; // Size

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

@@ -725,9 +725,7 @@ QString WatchItem::displayValue() const
QString WatchItem::displayType() const QString WatchItem::displayType() const
{ {
QString result = displayedType.isEmpty() QString result = niceTypeHelper(type);
? niceTypeHelper(type)
: displayedType;
if (bitsize) if (bitsize)
result += QString::fromLatin1(":%1").arg(bitsize); result += QString::fromLatin1(":%1").arg(bitsize);
result.remove(QLatin1Char('\'')); result.remove(QLatin1Char('\''));
@@ -776,9 +774,6 @@ QVariant WatchItem::data(int column, int role) const
case 1: case 1:
return editValue(); return editValue();
case 2: case 2:
// FIXME:: To be tested: Can debuggers handle those?
if (!displayedType.isEmpty())
return displayedType;
return QString::fromUtf8(type); return QString::fromUtf8(type);
} }
} }