Debugger: Remove unusued WatchData::displayType member

Change-Id: I475c5f6ee90434a6e85342d8bb71bd10a04dd27b
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>

src/plugins/debugger/watchdata.cpp

@@ -319,8 +319,6 @@ QString WatchData::toToolTip() const
     formatToolTipRow(str, tr("Name"), name);
     formatToolTipRow(str, tr("Expression"), QLatin1String(exp));
     formatToolTipRow(str, tr("Internal Type"), QLatin1String(type));
-    if (!displayedType.isEmpty())
-        formatToolTipRow(str, tr("Displayed Type"), displayedType);
     bool ok;
     const quint64 intValue = value.toULongLong(&ok);
     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)
 {
     if (item.isValid())
         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.
 
 template <class T>

src/plugins/debugger/watchdata.h

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

src/plugins/debugger/watchhandler.cpp

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