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

Debugger: Hide some dock widget access

Browse Source 
Change-Id: I6cd12a0a7a04f4d37165828552c08263537cfdbb
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-07-16 16:32:47 +02:00
parent 3a9e0d82bf
commit 7347ecc54b
3 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/debugger/debuggermainwindow.cpp
View File

@@ -90,6 +90,8 @@ public:
// Debuggable languages are registered with this function. // Debuggable languages are registered with this function.
void addLanguage(DebuggerLanguage language, const Core::Context &context); void addLanguage(DebuggerLanguage language, const Core::Context &context);
QDockWidget *dockWidget(const QString &objectName) const
{ return q->findChild<QDockWidget *>(objectName); }
public slots: public slots:
void resetDebuggerLayout(); void resetDebuggerLayout();
@@ -389,17 +391,6 @@ void DebuggerMainWindow::setToolBar(DebuggerLanguage language, QWidget *widget)
d->m_debugToolBarLayout->insertWidget(-1, widget, 10); 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 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 *toolBarDock = q->toolBarDockWidget();
QDockWidget *breakDock = q->dockWidget(QLatin1String(DOCKWIDGET_BREAK)); QDockWidget *breakDock = dockWidget(QLatin1String(DOCKWIDGET_BREAK));
QDockWidget *stackDock = q->dockWidget(QLatin1String(DOCKWIDGET_STACK)); QDockWidget *stackDock = dockWidget(QLatin1String(DOCKWIDGET_STACK));
QDockWidget *watchDock = q->dockWidget(QLatin1String(DOCKWIDGET_WATCHERS)); QDockWidget *watchDock = dockWidget(QLatin1String(DOCKWIDGET_WATCHERS));
QDockWidget *snapshotsDock = q->dockWidget(QLatin1String(DOCKWIDGET_SNAPSHOTS)); QDockWidget *snapshotsDock = dockWidget(QLatin1String(DOCKWIDGET_SNAPSHOTS));
QDockWidget *threadsDock = q->dockWidget(QLatin1String(DOCKWIDGET_THREADS)); QDockWidget *threadsDock = dockWidget(QLatin1String(DOCKWIDGET_THREADS));
QDockWidget *outputDock = q->dockWidget(QLatin1String(DOCKWIDGET_OUTPUT)); QDockWidget *outputDock = dockWidget(QLatin1String(DOCKWIDGET_OUTPUT));
QDockWidget *qmlInspectorDock = q->dockWidget(QLatin1String(DOCKWIDGET_QML_INSPECTOR)); QDockWidget *qmlInspectorDock = dockWidget(QLatin1String(DOCKWIDGET_QML_INSPECTOR));
QDockWidget *modulesDock = q->dockWidget(QLatin1String(DOCKWIDGET_MODULES)); QDockWidget *modulesDock = dockWidget(QLatin1String(DOCKWIDGET_MODULES));
QDockWidget *registerDock = q->dockWidget(QLatin1String(DOCKWIDGET_REGISTER)); QDockWidget *registerDock = dockWidget(QLatin1String(DOCKWIDGET_REGISTER));
QDockWidget *sourceFilesDock = q->dockWidget(QLatin1String(DOCKWIDGET_SOURCE_FILES)); QDockWidget *sourceFilesDock = dockWidget(QLatin1String(DOCKWIDGET_SOURCE_FILES));
QTC_ASSERT(breakDock, return); QTC_ASSERT(breakDock, return);
QTC_ASSERT(stackDock, return); QTC_ASSERT(stackDock, return);

2
src/plugins/debugger/debuggermainwindow.h
View File

@@ -80,8 +80,6 @@ public:
void initialize(); void initialize();
void onModeChanged(Core::IMode *mode); void onModeChanged(Core::IMode *mode);
QDockWidget *dockWidget(const QString &objectName) const;
bool isDockVisible(const QString &objectName) const;
// Dockwidgets are registered to the main window. // Dockwidgets are registered to the main window.
QDockWidget *createDockWidget(const DebuggerLanguage &language, QWidget *widget); QDockWidget *createDockWidget(const DebuggerLanguage &language, QWidget *widget);

6
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -909,8 +909,12 @@ public slots:
const CPlusPlus::Snapshot &cppCodeModelSnapshot() const; const CPlusPlus::Snapshot &cppCodeModelSnapshot() const;
DebuggerMainWindow *mainWindow() const { return m_mainWindow; } DebuggerMainWindow *mainWindow() const { return m_mainWindow; }
bool isDockVisible(const QString &objectName) const 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(); } bool hasSnapshots() const { return m_snapshotHandler->size(); }
void createNewDock(QWidget *widget); void createNewDock(QWidget *widget);