debugger: Rework watch model.

It's now properly using canFetchMore/fetchMore. cdb is not yet ported.

1 files changed, 4 insertions, 11 deletions

diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp
index 8517cd7c34..c8e35886fc 100644
--- a/src/plugins/debugger/script/scriptengine.cpp
+++ b/src/plugins/debugger/script/scriptengine.cpp
@@ -572,7 +572,7 @@ void ScriptEngine::maybeBreakNow(bool byFunction)
 void ScriptEngine::updateLocals()
 {
     QScriptContext *context = m_scriptEngine->currentContext();
-    qq->watchHandler()->reinitializeWatchers();
+    qq->watchHandler()->beginCycle();
     //SDEBUG("UPDATE LOCALS");
 
     //
@@ -605,7 +605,6 @@ void ScriptEngine::updateLocals()
     data.name = "local";
     data.scriptValue = context->activationObject();
     qq->watchHandler()->insertData(data);
-    updateWatchModel();
 
     // FIXME: Use an extra thread. This here is evil
     m_stopped = true;
@@ -616,16 +615,10 @@ void ScriptEngine::updateLocals()
     //SDEBUG("RUNNING AGAIN");
 }
 
-void ScriptEngine::updateWatchModel()
+void ScriptEngine::updateWatchData(const WatchData &data)
 {
-    while (true) {
-        QList<WatchData> list = qq->watchHandler()->takeCurrentIncompletes();
-        if (list.isEmpty())
-            break;
-        foreach (const WatchData &data, list)
-            updateSubItem(data);
-    }
-    qq->watchHandler()->rebuildModel();
+    updateSubItem(data);
+    //qq->watchHandler()->rebuildModel();
     q->showStatusMessage(tr("Stopped."), 5000);
 }