diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp index 6c82d9887fc6d8691e9ab3ab4fab2ca0c3b0a78e..30d72c378ccddae836adfd329328328dd99da06c 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.cpp +++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp @@ -708,11 +708,6 @@ void QmlInspectorAgent::clearObjectTree() m_objectWatches.clear(); } -BaseToolsClient *QmlInspectorAgent::toolsClient() const -{ - return m_toolsClient; -} - void QmlInspectorAgent::clientStateChanged(QmlDebugClient::State state) { QString serviceName; @@ -805,32 +800,32 @@ void QmlInspectorAgent::selectObjectsFromToolsClient(const QList<int> &debugIds) void QmlInspectorAgent::onSelectActionTriggered(bool checked) { - QTC_ASSERT(toolsClient(), return); + QTC_ASSERT(m_toolsClient, return); if (checked) { - toolsClient()->setDesignModeBehavior(true); - toolsClient()->changeToSelectTool(); + m_toolsClient->setDesignModeBehavior(true); + m_toolsClient->changeToSelectTool(); m_zoomAction->setChecked(false); } else { - toolsClient()->setDesignModeBehavior(false); + m_toolsClient->setDesignModeBehavior(false); } } void QmlInspectorAgent::onZoomActionTriggered(bool checked) { - QTC_ASSERT(toolsClient(), return); + QTC_ASSERT(m_toolsClient, return); if (checked) { - toolsClient()->setDesignModeBehavior(true); - toolsClient()->changeToZoomTool(); + m_toolsClient->setDesignModeBehavior(true); + m_toolsClient->changeToZoomTool(); m_selectAction->setChecked(false); } else { - toolsClient()->setDesignModeBehavior(false); + m_toolsClient->setDesignModeBehavior(false); } } void QmlInspectorAgent::onShowAppOnTopChanged(bool checked) { - QTC_ASSERT(toolsClient(), return); - toolsClient()->showAppOnTop(checked); + QTC_ASSERT(m_toolsClient, return); + m_toolsClient->showAppOnTop(checked); } void QmlInspectorAgent::setActiveEngineClient(BaseEngineDebugClient *client) diff --git a/src/plugins/debugger/qml/qmlinspectoragent.h b/src/plugins/debugger/qml/qmlinspectoragent.h index 626ab4c7233de1b297c02da0e23e881b62b7dd01..89ab13fee5b99e8a4abc3c84c1db06c9e04ae544 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.h +++ b/src/plugins/debugger/qml/qmlinspectoragent.h @@ -55,25 +55,24 @@ QHash<QPair<QString, int>, QHash<QPair<int, int>, QList<int> > > DebugIdHash; class QmlInspectorAgent : public QObject { Q_OBJECT + public: QmlInspectorAgent(QmlEngine *engine, QmlDebug::QmlDebugConnection *connection); - void fetchObject(int debugId); quint32 queryExpressionResult(int debugId, const QString &expression); - void assignValue(const WatchItem *data, const QString &expression, const QVariant &valueV); void updateWatchData(const WatchItem &data); void watchDataSelected(qint64 id); + +private: bool selectObjectInTree(int debugId); void addObjectWatch(int objectDebugId); QmlDebug::ObjectReference objectForId(int objectDebugId) const; QString displayName(int objectDebugId) const; void reloadEngines(); + void fetchObject(int debugId); - QmlDebug::BaseToolsClient *toolsClient() const; - -private: void updateState(); void onResult(quint32 queryId, const QVariant &value, const QByteArray &type); void newObject(int engineId, int objectId, int parentId);