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

QmlJSInspector: Query Objects Iteratively

Browse Source 
Currently all objects are recursively fetched when the root context
is retrieved. This patch fetches objects on demand.

Change-Id: Idf5c621ec38869dd5a676116bc4df528d7bb2fda
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Aurindam Jana
2012-03-19 15:58:47 +01:00
parent 66ed2b37ba
commit e412a93006
8 changed files with 106 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/qmljsinspector/qmljsclientproxy.cpp
View File

@@ -202,6 +202,18 @@ void ClientProxy::setSelectedItemsByObjectId(
}
}
void ClientProxy::addObjectToTree(const QmlDebugObjectReference &obj)
{
int count = m_rootObjects.count();
for (int i = 0; i < count; i++) {
if (m_rootObjects[i].insertObjectInTree(obj)) {
buildDebugIdHashRecursive(obj);
emit objectTreeUpdated();
break;
}
}
}
QmlDebugObjectReference ClientProxy::objectReferenceForId(int debugId) const
{
foreach (const QmlDebugObjectReference& it, m_rootObjects) {
@@ -482,6 +494,13 @@ void ClientProxy::contextChanged(const QVariant &value)
}
}
quint32 ClientProxy::fetchContextObject(const QmlDebugObjectReference& obj)
{
log(LogSend, QString("FETCH_OBJECT %1").arg(obj.idString()));
return m_engineClient->queryObject(obj);
}
void ClientProxy::fetchContextObjectRecursive(
const QmlDebugContextReference& context)
{
@@ -492,7 +511,7 @@ void ClientProxy::fetchContextObjectRecursive(
log(LogSend, QString("FETCH_OBJECT %1").arg(obj.idString()));
quint32 queryId = m_engineClient->queryObjectRecursive(obj);
quint32 queryId = fetchContextObject(obj);
if (queryId)
m_objectTreeQueryIds << queryId;
}