analyze: rework 'addDock'

Change-Id: I3ce22c3f75d5cc631ab22e02f8a52af00452c0c3
Reviewed-on: http://codereview.qt.nokia.com/57
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk
This commit is contained in:
hjk
2011-05-20 18:47:28 +02:00
committed by hjk
parent 39b71920b3
commit 251bff8a9c
3 changed files with 20 additions and 24 deletions

View File

@@ -200,7 +200,7 @@ public:
const QString &stopButtonText,
const QString &cancelButtonText) const;
void addDock(IAnalyzerTool *tool, Qt::DockWidgetArea area, QDockWidget *dockWidget);
void addDock(Qt::DockWidgetArea area, QDockWidget *dockWidget);
void startTool();
AnalyzerManager *q;
@@ -450,11 +450,9 @@ QWidget *AnalyzerManager::AnalyzerManagerPrivate::createModeMainWindow()
return m_mainWindow;
}
void AnalyzerManager::AnalyzerManagerPrivate::addDock(IAnalyzerTool *tool, Qt::DockWidgetArea area,
void AnalyzerManager::AnalyzerManagerPrivate::addDock(Qt::DockWidgetArea area,
QDockWidget *dockWidget)
{
QTC_ASSERT(tool == q->currentTool(), return)
dockWidget->setParent(m_mainWindow);
m_mainWindow->addDockWidget(area, dockWidget);
@@ -467,11 +465,6 @@ void AnalyzerManager::AnalyzerManagerPrivate::addDock(IAnalyzerTool *tool, Qt::D
globalContext);
cmd->setAttribute(Command::CA_Hide);
m_viewsMenu->addAction(cmd);
// just add the dock below the toolbar by default
m_mainWindow->splitDockWidget(m_mainWindow->toolBarDockWidget(), dockWidget,
Qt::Vertical);
dockWidget->show();
}
bool buildTypeAccepted(IAnalyzerTool::ToolMode toolMode,
@@ -687,7 +680,7 @@ void AnalyzerManager::toolSelected(int idx)
d->m_defaultSettings.insert(newTool, d->m_mainWindow->saveSettings());
} else {
foreach (const ToolDockWidgetData &widget, d->m_toolWidgets.value(newTool))
d->addDock(newTool, widget.area, widget.widget);
d->addDock(widget.area, widget.widget);
}
loadToolSettings(newTool);
@@ -748,7 +741,7 @@ QDockWidget *AnalyzerManager::createDockWidget(IAnalyzerTool *tool, const QStrin
dockWidget->setWindowTitle(title);
d->m_toolWidgets[tool].push_back(ToolDockWidgetData(area, dockWidget));
d->addDock(tool, area, dockWidget);
d->addDock(area, dockWidget);
dockWidget->installEventFilter(d->m_resizeEventFilter);
return dockWidget;
}