Debugger: Slim down public QmlInspectorAgent interface

Change-Id: Ia2f728029530dfe4e3f4cc9c18313453f4851bc4
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

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)

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);