Debugger: Consolidate Debugger view creation

Change-Id: I43353911c7c0c8250ee2bccddcf5fdccf04d457c
Reviewed-by: hjk <hjk121@nokiamail.com>

2 files changed, 5 insertions, 11 deletions

diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 63707d00d6..1f5f4cbf08 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -80,6 +80,11 @@ using namespace AST;
 namespace Debugger {
 namespace Internal {
 
+static QTreeView *inspectorTreeView()
+{
+    return DebuggerCore::inspectorView();
+}
+
 class ASTWalker : public Visitor
 {
 public:
@@ -1359,15 +1364,6 @@ bool QmlEngine::adjustBreakpointLineAndColumn(
     return success;
 }
 
-WatchTreeView *QmlEngine::inspectorTreeView() const
-{
-    DebuggerMainWindow *dw = qobject_cast<DebuggerMainWindow *>(debuggerCore()->mainWindow());
-    LocalsAndExpressionsWindow *leW = qobject_cast<LocalsAndExpressionsWindow *>(
-                dw->dockWidget(_(DOCKWIDGET_WATCHERS))->widget());
-    WatchWindow *inspectorWindow = qobject_cast<WatchWindow *>(leW->inspectorWidget());
-    return qobject_cast<WatchTreeView *>(inspectorWindow->treeView());
-}
-
 DebuggerEngine *createQmlEngine(const DebuggerStartParameters &sp)
 {
     return new QmlEngine(sp);
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index 8901f8f89c..8a9e4bb98b 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -184,8 +184,6 @@ private:
     bool adjustBreakpointLineAndColumn(const QString &filePath, quint32 *line,
                                        quint32 *column, bool *valid);
 
-    WatchTreeView *inspectorTreeView() const;
-
     QmlAdapter m_adapter;
     QmlInspectorAdapter m_inspectorAdapter;
     ProjectExplorer::ApplicationLauncher m_applicationLauncher;