feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Rename WatchHandler::remove{Data->ItemByIName}

Browse Source 
That's what it does.

Change-Id: If1a1bf91220630ad09e5ec8636ccb9d67c8d0947
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-03-06 16:40:22 +01:00
parent 915bb5413c
commit ef894f21e2
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/qml/qmlinspectoragent.cpp
View File

@@ -775,7 +775,7 @@ QList<WatchData> QmlInspectorAgent::buildWatchData(const ObjectReference &obj,
// hence we can insert the data in the correct position // hence we can insert the data in the correct position
const QByteArray oldIname = m_debugIdToIname.value(objDebugId); const QByteArray oldIname = m_debugIdToIname.value(objDebugId);
if (oldIname != objIname) if (oldIname != objIname)
m_debuggerEngine->watchHandler()->removeData(oldIname); m_debuggerEngine->watchHandler()->removeItemByIName(oldIname);
} }
m_debugIdToIname.insert(objDebugId, objIname); m_debugIdToIname.insert(objDebugId, objIname);
} }

2
src/plugins/debugger/watchhandler.cpp
View File

@@ -1284,7 +1284,7 @@ void WatchHandler::purgeOutdatedItems(const QSet<QByteArray> &inames)
updateWatchersWindow(); updateWatchersWindow();
} }
void WatchHandler::removeData(const QByteArray &iname) void WatchHandler::removeItemByIName(const QByteArray &iname)
{ {
WatchItem *item = m_model->findItem(iname); WatchItem *item = m_model->findItem(iname);
if (!item) if (!item)

2
src/plugins/debugger/watchhandler.h
View File

@@ -239,7 +239,7 @@ public:
void insertData(const WatchData &data); // DEPRECATED void insertData(const WatchData &data); // DEPRECATED
void insertDataList(const QList<WatchData> &list); // DEPRECATED void insertDataList(const QList<WatchData> &list); // DEPRECATED
void insertItem(WatchItem *item); // Takes ownership. void insertItem(WatchItem *item); // Takes ownership.
void removeData(const QByteArray &iname); void removeItemByIName(const QByteArray &iname);
void removeAllData(bool includeInspectData = false); void removeAllData(bool includeInspectData = false);
void resetValueCache(); void resetValueCache();
void purgeOutdatedItems(const QSet<QByteArray> &inames); void purgeOutdatedItems(const QSet<QByteArray> &inames);

4
src/plugins/debugger/watchwindow.cpp
View File

@@ -460,7 +460,7 @@ void WatchTreeView::keyPressEvent(QKeyEvent *ev)
if (ev->key() == Qt::Key_Delete && m_type == WatchersType) { if (ev->key() == Qt::Key_Delete && m_type == WatchersType) {
WatchHandler *handler = currentEngine()->watchHandler(); WatchHandler *handler = currentEngine()->watchHandler();
foreach (const QModelIndex &idx, activeRows()) foreach (const QModelIndex &idx, activeRows())
handler->removeData(idx.data(LocalsINameRole).toByteArray()); handler->removeItemByIName(idx.data(LocalsINameRole).toByteArray());
} else if (ev->key() == Qt::Key_Return } else if (ev->key() == Qt::Key_Return
&& ev->modifiers() == Qt::ControlModifier && ev->modifiers() == Qt::ControlModifier
&& m_type == LocalsType) { && m_type == LocalsType) {
@@ -886,7 +886,7 @@ void WatchTreeView::contextMenuEvent(QContextMenuEvent *ev)
} else if (act == &actWatchExpression) { } else if (act == &actWatchExpression) {
watchExpression(exp, name); watchExpression(exp, name);
} else if (act == &actRemoveWatchExpression) { } else if (act == &actRemoveWatchExpression) {
handler->removeData(p.data(LocalsINameRole).toByteArray()); handler->removeItemByIName(p.data(LocalsINameRole).toByteArray());
} else if (act == &actRemoveAllWatchExpression) { } else if (act == &actRemoveAllWatchExpression) {
handler->clearWatches(); handler->clearWatches();
} else if (act == &actCopy) { } else if (act == &actCopy) {