From 7347ecc54b9e8ba7b63a0543624fc9e9761f3677 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Wed, 16 Jul 2014 16:32:47 +0200
Subject: [PATCH] Debugger: Hide some dock widget access

Change-Id: I6cd12a0a7a04f4d37165828552c08263537cfdbb
Reviewed-by: hjk <hjk121@nokiamail.com>
---
 src/plugins/debugger/debuggermainwindow.cpp | 33 ++++++++-------------
 src/plugins/debugger/debuggermainwindow.h   |  2 --
 src/plugins/debugger/debuggerplugin.cpp     |  6 +++-
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index c06a3c5e68b..190b0152b2c 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -90,6 +90,8 @@ public:
     // Debuggable languages are registered with this function.
     void addLanguage(DebuggerLanguage language, const Core::Context &context);
 
+    QDockWidget *dockWidget(const QString &objectName) const
+        { return q->findChild<QDockWidget *>(objectName); }
 
 public slots:
     void resetDebuggerLayout();
@@ -389,17 +391,6 @@ void DebuggerMainWindow::setToolBar(DebuggerLanguage language, QWidget *widget)
         d->m_debugToolBarLayout->insertWidget(-1, widget, 10);
 }
 
-QDockWidget *DebuggerMainWindow::dockWidget(const QString &objectName) const
-{
-    return findChild<QDockWidget *>(objectName);
-}
-
-bool DebuggerMainWindow::isDockVisible(const QString &objectName) const
-{
-    QDockWidget *dock = dockWidget(objectName);
-    return dock && dock->toggleViewAction()->isChecked();
-}
-
 /*!
     Keep track of dock widgets so they can be shown/hidden for different languages
 */
@@ -649,16 +640,16 @@ void DebuggerMainWindowPrivate::setSimpleDockWidgetArrangement()
     }
 
     QDockWidget *toolBarDock = q->toolBarDockWidget();
-    QDockWidget *breakDock = q->dockWidget(QLatin1String(DOCKWIDGET_BREAK));
-    QDockWidget *stackDock = q->dockWidget(QLatin1String(DOCKWIDGET_STACK));
-    QDockWidget *watchDock = q->dockWidget(QLatin1String(DOCKWIDGET_WATCHERS));
-    QDockWidget *snapshotsDock = q->dockWidget(QLatin1String(DOCKWIDGET_SNAPSHOTS));
-    QDockWidget *threadsDock = q->dockWidget(QLatin1String(DOCKWIDGET_THREADS));
-    QDockWidget *outputDock = q->dockWidget(QLatin1String(DOCKWIDGET_OUTPUT));
-    QDockWidget *qmlInspectorDock = q->dockWidget(QLatin1String(DOCKWIDGET_QML_INSPECTOR));
-    QDockWidget *modulesDock = q->dockWidget(QLatin1String(DOCKWIDGET_MODULES));
-    QDockWidget *registerDock = q->dockWidget(QLatin1String(DOCKWIDGET_REGISTER));
-    QDockWidget *sourceFilesDock = q->dockWidget(QLatin1String(DOCKWIDGET_SOURCE_FILES));
+    QDockWidget *breakDock = dockWidget(QLatin1String(DOCKWIDGET_BREAK));
+    QDockWidget *stackDock = dockWidget(QLatin1String(DOCKWIDGET_STACK));
+    QDockWidget *watchDock = dockWidget(QLatin1String(DOCKWIDGET_WATCHERS));
+    QDockWidget *snapshotsDock = dockWidget(QLatin1String(DOCKWIDGET_SNAPSHOTS));
+    QDockWidget *threadsDock = dockWidget(QLatin1String(DOCKWIDGET_THREADS));
+    QDockWidget *outputDock = dockWidget(QLatin1String(DOCKWIDGET_OUTPUT));
+    QDockWidget *qmlInspectorDock = dockWidget(QLatin1String(DOCKWIDGET_QML_INSPECTOR));
+    QDockWidget *modulesDock = dockWidget(QLatin1String(DOCKWIDGET_MODULES));
+    QDockWidget *registerDock = dockWidget(QLatin1String(DOCKWIDGET_REGISTER));
+    QDockWidget *sourceFilesDock = dockWidget(QLatin1String(DOCKWIDGET_SOURCE_FILES));
 
     QTC_ASSERT(breakDock, return);
     QTC_ASSERT(stackDock, return);
diff --git a/src/plugins/debugger/debuggermainwindow.h b/src/plugins/debugger/debuggermainwindow.h
index ad9b55599df..6ebc2e5c9c2 100644
--- a/src/plugins/debugger/debuggermainwindow.h
+++ b/src/plugins/debugger/debuggermainwindow.h
@@ -80,8 +80,6 @@ public:
     void initialize();
 
     void onModeChanged(Core::IMode *mode);
-    QDockWidget *dockWidget(const QString &objectName) const;
-    bool isDockVisible(const QString &objectName) const;
 
     // Dockwidgets are registered to the main window.
     QDockWidget *createDockWidget(const DebuggerLanguage &language, QWidget *widget);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 7fb961d8107..60ab8baa4b0 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -909,8 +909,12 @@ public slots:
     const CPlusPlus::Snapshot &cppCodeModelSnapshot() const;
 
     DebuggerMainWindow *mainWindow() const { return m_mainWindow; }
+
     bool isDockVisible(const QString &objectName) const
-        { return mainWindow()->isDockVisible(objectName); }
+    {
+        QDockWidget *dock = mainWindow()->findChild<QDockWidget *>(objectName);
+        return dock && dock->toggleViewAction()->isChecked();
+    }
 
     bool hasSnapshots() const { return m_snapshotHandler->size(); }
     void createNewDock(QWidget *widget);