Debugger: Remove most remaining occurrences of WatchData

... in WatchHandler and DebuggerEngine interface.
Adjust using code.

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

1 files changed, 19 insertions, 15 deletions

diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
index 923a1bcb89..fd9b246557 100644
--- a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
+++ b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
@@ -482,16 +482,18 @@ void QScriptDebuggerClient::messageReceived(const QByteArray &data)
 
         d->logReceiveMessage(QLatin1String(command) + QLatin1Char(' ')
                              +  QLatin1String(iname) + QLatin1Char(' ') + data.value);
-        data.iname = iname;
+
+        auto item = new WatchItem(data);
+        item->iname = iname;
         if (iname.startsWith("watch.")) {
-            watchHandler->insertData(data);
+            watchHandler->insertItem(item);
         } else if (iname == "console") {
-            d->engine->showMessage(data.value, ConsoleOutput);
+            d->engine->showMessage(item->value, ConsoleOutput);
         } else if (iname.startsWith("local.")) {
-            data.name = data.name.left(data.name.indexOf(QLatin1Char(' ')));
-            watchHandler->insertData(data);
+            item->name = item->name.left(item->name.indexOf(QLatin1Char(' ')));
+            watchHandler->insertItem(item);
         } else {
-            qWarning() << "QmlEngine: Unexcpected result: " << iname << data.value;
+            qWarning() << "QmlEngine: Unexcpected result: " << iname << item->value;
         }
     } else if (command == "EXPANDED") {
         QList<WatchData> result;
@@ -504,7 +506,7 @@ void QScriptDebuggerClient::messageReceived(const QByteArray &data)
 
         foreach (WatchData data, result) {
             data.iname = iname + '.' + data.exp;
-            watchHandler->insertData(data);
+            watchHandler->insertItem(new WatchItem(data));
 
             if (watchHandler->isExpandedIName(data.iname) && qint64(data.id) != -1) {
                 needPing = true;
@@ -552,9 +554,10 @@ void QScriptDebuggerClient::insertLocalsAndWatches(QList<WatchData> &locals,
         return;
 
     bool needPing = false;
-    foreach (WatchData data, watches) {
-        data.iname = watchHandler->watcherName(data.exp);
-        watchHandler->insertData(data);
+    foreach (const WatchData &data, watches) {
+        auto item = new WatchItem(data);
+        item->iname = watchHandler->watcherName(data.exp);
+        watchHandler->insertItem(item);
 
         if (watchHandler->isExpandedIName(data.iname) && qint64(data.id) != -1) {
             needPing = true;
@@ -562,11 +565,12 @@ void QScriptDebuggerClient::insertLocalsAndWatches(QList<WatchData> &locals,
         }
     }
 
-    foreach (WatchData data, locals) {
-        if (data.name == QLatin1String("<no initialized data>"))
-            data.name = tr("No Local Variables");
-        data.iname = "local." + data.exp;
-        watchHandler->insertData(data);
+    foreach (const WatchData &data, locals) {
+        auto item = new WatchItem(data);
+        if (item->name == QLatin1String("<no initialized data>"))
+            item->name = tr("No Local Variables");
+        item->iname = "local." + item->exp;
+        watchHandler->insertItem(item);
 
         if (watchHandler->isExpandedIName(data.iname) && qint64(data.id) != -1) {
             needPing = true;