debugger: rework WatchModel

It's one model for all locals, watch, return, tooltip and inspector
data. This allows more streamlined code paths and better isolation
of the model data from the WatchHandler. WatchItems are now registered
in a hash indexed by iname, so inames can be used as the primary
handle to watch data in the WatchHandler interface.

Change-Id: Idac0a808b5d785307496d1de4198a1f2e9ce3880
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp
index 16d758f6c9..efe52b8d41 100644
--- a/src/plugins/debugger/script/scriptengine.cpp
+++ b/src/plugins/debugger/script/scriptengine.cpp
@@ -651,7 +651,6 @@ bool ScriptEngine::checkForBreakCondition(bool byFunction)
 void ScriptEngine::updateLocals()
 {
     QScriptContext *context = m_scriptEngine->currentContext();
-    watchHandler()->beginCycle();
     SDEBUG(Q_FUNC_INFO);
 
     //
@@ -686,9 +685,7 @@ void ScriptEngine::updateLocals()
     data.iname = "local";
     data.name = _(data.iname);
 
-    watchHandler()->beginCycle();
     updateSubItem(data);
-    watchHandler()->endCycle();
     // FIXME: Use an extra thread. This here is evil.
     m_stopped = true;
     showStatusMessage(tr("Stopped."), 5000);
@@ -809,9 +806,9 @@ void ScriptEngine::updateSubItem(const WatchData &data0)
     }
 
     SDEBUG(msgDebugInsert(data, children));
-    watchHandler()->insertData(data);
+    watchHandler()->insertIncompleteData(data);
     if (!children.isEmpty())
-        watchHandler()->insertBulkData(children);
+        watchHandler()->insertData(children);
 }
 
 DebuggerEngine *createScriptEngine(const DebuggerStartParameters &sp)