From a7bf3c49a434fe3112a1434ec26b9474cb9a9532 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Fri, 6 Mar 2015 10:30:56 +0100
Subject: [PATCH] Debugger: Remove WatchHandler::insertIncompleteData

... and replace at caller side it with the used parts
of the code.

Change-Id: Id612c66ac6d95bfc12aba16e9247cc81991dd779
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
---
 src/plugins/debugger/watchhandler.cpp | 36 ++-------------------------
 src/plugins/debugger/watchhandler.h   |  1 -
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 8f568742ea3..b9f8ebb2891 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -1198,36 +1198,6 @@ void WatchHandler::cleanup()
     m_separatedView->hide();
 }
 
-void WatchHandler::insertIncompleteData(const WatchData &data)
-{
-    MODEL_DEBUG("INSERTDATA: " << data.toString());
-    if (!data.isValid()) {
-        qWarning("%s:%d: Attempt to insert invalid watch item: %s",
-            __FILE__, __LINE__, qPrintable(data.toString()));
-        return;
-    }
-
-    if (data.isSomethingNeeded() && data.iname.contains('.')) {
-        MODEL_DEBUG("SOMETHING NEEDED: " << data.toString());
-        if (!m_engine->isSynchronous() || data.isInspect()) {
-            m_model->insertDataItem(data, true);
-            m_engine->updateWatchData(data);
-        } else {
-            m_engine->showMessage(QLatin1String("ENDLESS LOOP: SOMETHING NEEDED: ")
-                + data.toString());
-            WatchData data1 = data;
-            data1.setAllUnneeded();
-            data1.setValue(QLatin1String("<unavailable synchronous data>"));
-            data1.setHasChildren(false);
-            m_model->insertDataItem(data1, true);
-        }
-    } else {
-        MODEL_DEBUG("NOTHING NEEDED: " << data.toString());
-        m_model->insertDataItem(data, true);
-        showEditValue(data);
-    }
-}
-
 void WatchHandler::insertItem(WatchItem *item)
 {
     m_model->insertItem(item);
@@ -1356,11 +1326,9 @@ void WatchHandler::watchExpression(const QString &exp0, const QString &name)
         data.setAllUnneeded();
         data.setValue(QString(QLatin1Char(' ')));
         data.setHasChildren(false);
-        insertIncompleteData(data);
-    } else if (m_engine->isSynchronous()) {
-        m_engine->updateWatchData(data);
+        insertData(data);
     } else {
-        insertIncompleteData(data);
+        m_engine->updateWatchData(data);
     }
     updateWatchersWindow();
 }
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index 0687bce3a68..303c56a040f 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -238,7 +238,6 @@ public:
 
     void insertData(const WatchData &data); // Convenience.
     void insertData(const QList<WatchData> &list);
-    void insertIncompleteData(const WatchData &data);
     void insertItem(WatchItem *item); // Takes ownership.
     void removeData(const QByteArray &iname);
     void removeChildren(const QByteArray &iname);