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

Debugger: Remove most remaining occurrences of WatchData

Browse Source 
... 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>
This commit is contained in:
hjk
2015-03-19 12:42:53 +01:00
parent b08e5a9bc3
commit b3f88df41d
28 changed files with 468 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -112,18 +112,18 @@ bool QmlCppEngine::setToolTipExpression(const DebuggerToolTipContext &ctx)
return success;
}
void QmlCppEngine::updateWatchData(const WatchData &data)
void QmlCppEngine::updateWatchItem(WatchItem *item)
{
if (data.isInspect())
m_qmlEngine->updateWatchData(data);
if (item->isInspect())
m_qmlEngine->updateWatchItem(item);
else
m_activeEngine->updateWatchData(data);
m_activeEngine->updateWatchItem(item);
}
void QmlCppEngine::watchDataSelected(const QByteArray &iname)
{
const WatchData *wd = watchHandler()->findData(iname);
if (wd && wd->isInspect())
const WatchItem *item = watchHandler()->findItem(iname);
if (item && item->isInspect())
m_qmlEngine->watchDataSelected(iname);
}
@@ -264,13 +264,13 @@ void QmlCppEngine::selectThread(ThreadId threadId)
m_activeEngine->selectThread(threadId);
}
void QmlCppEngine::assignValueInDebugger(const WatchData *data,
void QmlCppEngine::assignValueInDebugger(WatchItem *item,
const QString &expr, const QVariant &value)
{
if (data->isInspect())
m_qmlEngine->assignValueInDebugger(data, expr, value);
if (item->isInspect())
m_qmlEngine->assignValueInDebugger(item, expr, value);
else
m_activeEngine->assignValueInDebugger(data, expr, value);
m_activeEngine->assignValueInDebugger(item, expr, value);
}
void QmlCppEngine::notifyInferiorIll()