Debugger: Remove unused WatchData::dumperFlags member

It was used for a hack to display QModelIndex with the compiled
dumpers. The hack is gone, no need for the member.

Change-Id: If8e439b51e0dbcf5c5ea58ad4b3adbbb161ced25
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

2 files changed, 5 insertions, 20 deletions

diff --git a/src/plugins/debugger/watchdata.cpp b/src/plugins/debugger/watchdata.cpp
index f0dac811e7..fa3ec0281e 100644
--- a/src/plugins/debugger/watchdata.cpp
+++ b/src/plugins/debugger/watchdata.cpp
@@ -329,9 +329,6 @@ QString WatchData::toString() const
         str << "editvalue=\"<...>\",";
     //    str << "editvalue=\"" << editvalue << doubleQuoteComma;
 
-    if (!dumperFlags.isEmpty())
-        str << "dumperFlags=\"" << dumperFlags << doubleQuoteComma;
-
     str << "type=\"" << type << doubleQuoteComma;
 
     str << "wantsChildren=\"" << (wantsChildren ? "true" : "false") << doubleQuoteComma;
@@ -466,7 +463,7 @@ static void setWatchDataAddress(WatchData &data, quint64 address)
 {
     data.address = address;
 
-    if (data.exp.isEmpty() && !data.dumperFlags.startsWith('$')) {
+    if (data.exp.isEmpty()) {
         if (data.iname.startsWith("local.") && data.iname.count('.') == 1)
             // Solve one common case of adding 'class' in
             // *(class X*)0xdeadbeef for gdb.
@@ -476,19 +473,6 @@ static void setWatchDataAddress(WatchData &data, quint64 address)
     }
 }
 
-void WatchData::updateAddress(const GdbMi &mi)
-{
-    if (!mi.isValid())
-        return;
-    const QByteArray addressBA = mi.data();
-    if (!addressBA.startsWith("0x")) { // Item model dumpers pull tricks.
-        dumperFlags = addressBA;
-        return;
-    }
-    const quint64 address = mi.toAddress();
-    setWatchDataAddress(*this, address);
-}
-
 static void setWatchDataSize(WatchData &data, const GdbMi &mi)
 {
     if (mi.isValid()) {
@@ -620,7 +604,10 @@ void parseChildrenData(const WatchData &data0, const GdbMi &item,
     if (mi.isValid())
         data.origaddr = mi.toAddress();
 
-    data.updateAddress(item["addr"]);
+    mi = item["addr"];
+    if (mi.isValid())
+        setWatchDataAddress(data, mi.toAddress());
+
     data.updateValue(item);
 
     setWatchDataSize(data, item["size"]);
diff --git a/src/plugins/debugger/watchdata.h b/src/plugins/debugger/watchdata.h
index 151edaf4c6..10b1eb0f61 100644
--- a/src/plugins/debugger/watchdata.h
+++ b/src/plugins/debugger/watchdata.h
@@ -102,7 +102,6 @@ public:
     // Protocol interaction.
     void updateValue(const GdbMi &item);
     void updateChildCount(const GdbMi &mi);
-    void updateAddress(const GdbMi &addressMi);
     void updateType(const GdbMi &item);
     void updateDisplayedType(const GdbMi &item);
 
@@ -128,7 +127,6 @@ public:
     bool            valueEditable; // Value will be editable
     bool            error;
     qint32          sortId;
-    QByteArray      dumperFlags;
 
     Q_DECLARE_TR_FUNCTIONS(Debugger::Internal::WatchHandler)