From 7c2c3307b3f0cf816b8f2ba0a12aee6cdfa7451e Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Fri, 6 Mar 2015 12:51:01 +0100
Subject: [PATCH] Debugger: Simplify GdbEngine::updateWatchData

The removed parts were only used with the non-Python engine.

Change-Id: Ia6858517b011c6f7ace8b2521beafdb4b03efc89
Reviewed-by: hjk <hjk@theqtcompany.com>
---
 src/plugins/debugger/gdb/gdbengine.cpp | 28 --------------------------
 src/plugins/debugger/gdb/gdbengine.h   |  1 -
 2 files changed, 29 deletions(-)

diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index fb369e4120b..a45e1c9c853 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3727,36 +3727,9 @@ void GdbEngine::reloadLocals()
 
 void GdbEngine::updateWatchData(const WatchData &data, const WatchUpdateFlags &flags)
 {
-    // This should only be called for fresh expanded items, not for
-    // items that had their children retrieved earlier.
-    //qDebug() << "\nUPDATE WATCH DATA: " << data.toString() << "\n";
-    if (data.iname.endsWith("."))
-        return;
-
-    // Avoid endless loops created by faulty dumpers.
-    QByteArray processedName = "1-" + data.iname;
-    //qDebug() << "PROCESSED NAMES: " << processedName << m_processedNames;
-    if (m_processedNames.contains(processedName)) {
-        showMessage(_("<Breaking endless loop for " + data.iname + '>'), LogMiscInput);
-        auto item = new WatchItem(data);
-        item->d.setAllUnneeded();
-        item->d.setValue(_("<unavailable>"));
-        item->d.setHasChildren(false);
-        watchHandler()->insertItem(item);
-        rebuildWatchModel();
-        return;
-    }
-    m_processedNames.insert(processedName);
-
-    // FIXME: Is this sufficient when "external" changes are
-    // triggered e.g. by manually entered command in the gdb console?
-    //qDebug() << "TRY PARTIAL: " << flags.tryIncremental
-    //        << (m_pendingBreakpointRequests == 0);
-
     UpdateParameters params;
     params.tryPartial = flags.tryIncremental && m_pendingBreakpointRequests == 0;
     params.varList = data.iname;
-
     updateLocalsPython(params);
 }
 
@@ -4740,7 +4713,6 @@ void GdbEngine::updateLocalsPython(const UpdateParameters &params)
 {
     //m_pendingWatchRequests = 0;
     m_pendingBreakpointRequests = 0;
-    m_processedNames.clear();
 
     DebuggerCommand cmd("showData");
     watchHandler()->appendFormatRequests(&cmd);
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 3e3bca06fe0..9fe2b4d8611 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -417,7 +417,6 @@ protected:
 
     void setLocals(const QList<GdbMi> &locals);
 
-    QSet<QByteArray> m_processedNames;
     struct TypeInfo
     {
         TypeInfo(uint s = 0) : size(s) {}