From ef894f21e28337805732f5e1b60a2d4b6f70ac98 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Fri, 6 Mar 2015 16:40:22 +0100
Subject: [PATCH] Debugger: Rename WatchHandler::remove{Data->ItemByIName}

That's what it does.

Change-Id: If1a1bf91220630ad09e5ec8636ccb9d67c8d0947
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
 src/plugins/debugger/qml/qmlinspectoragent.cpp | 2 +-
 src/plugins/debugger/watchhandler.cpp          | 2 +-
 src/plugins/debugger/watchhandler.h            | 2 +-
 src/plugins/debugger/watchwindow.cpp           | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp
index 4eaff580337..7e2aecc4697 100644
--- a/src/plugins/debugger/qml/qmlinspectoragent.cpp
+++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp
@@ -775,7 +775,7 @@ QList<WatchData> QmlInspectorAgent::buildWatchData(const ObjectReference &obj,
             // hence we can insert the data in the correct position
             const QByteArray oldIname = m_debugIdToIname.value(objDebugId);
             if (oldIname != objIname)
-                m_debuggerEngine->watchHandler()->removeData(oldIname);
+                m_debuggerEngine->watchHandler()->removeItemByIName(oldIname);
         }
         m_debugIdToIname.insert(objDebugId, objIname);
     }
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 0d669a79f93..1b6e7fc38ba 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -1284,7 +1284,7 @@ void WatchHandler::purgeOutdatedItems(const QSet<QByteArray> &inames)
     updateWatchersWindow();
 }
 
-void WatchHandler::removeData(const QByteArray &iname)
+void WatchHandler::removeItemByIName(const QByteArray &iname)
 {
     WatchItem *item = m_model->findItem(iname);
     if (!item)
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index 10d4184dd95..338a443203e 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -239,7 +239,7 @@ public:
     void insertData(const WatchData &data); // DEPRECATED
     void insertDataList(const QList<WatchData> &list); // DEPRECATED
     void insertItem(WatchItem *item); // Takes ownership.
-    void removeData(const QByteArray &iname);
+    void removeItemByIName(const QByteArray &iname);
     void removeAllData(bool includeInspectData = false);
     void resetValueCache();
     void purgeOutdatedItems(const QSet<QByteArray> &inames);
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index 4c359802695..12503058e55 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -460,7 +460,7 @@ void WatchTreeView::keyPressEvent(QKeyEvent *ev)
     if (ev->key() == Qt::Key_Delete && m_type == WatchersType) {
         WatchHandler *handler = currentEngine()->watchHandler();
         foreach (const QModelIndex &idx, activeRows())
-            handler->removeData(idx.data(LocalsINameRole).toByteArray());
+            handler->removeItemByIName(idx.data(LocalsINameRole).toByteArray());
     } else if (ev->key() == Qt::Key_Return
             && ev->modifiers() == Qt::ControlModifier
             && m_type == LocalsType) {
@@ -886,7 +886,7 @@ void WatchTreeView::contextMenuEvent(QContextMenuEvent *ev)
     } else if (act == &actWatchExpression) {
         watchExpression(exp, name);
     } else if (act == &actRemoveWatchExpression) {
-        handler->removeData(p.data(LocalsINameRole).toByteArray());
+        handler->removeItemByIName(p.data(LocalsINameRole).toByteArray());
     } else if (act == &actRemoveAllWatchExpression) {
         handler->clearWatches();
     } else if (act == &actCopy) {