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

Analyzers: Various cleanups

Browse Source 
Fallout after the demise of IAnalizerTool.

Change-Id: I68f936ed5f2929dc4f09a408bdf6b0ea38e568ef
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-02-18 16:43:01 +01:00
parent 8b8f8ca2ba
commit 9d707ac63c
8 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/analyzerbase/analyzermanager.cpp
View File

@@ -153,14 +153,9 @@ public:
void handleToolFinished();
void saveToolSettings(Id toolId);
void loadToolSettings(Id toolId);
// Convenience.
bool isActionRunnable(AnalyzerAction *action) const;
public slots:
void startTool();
void selectToolboxAction(int);
void selectMenuAction();
void modeChanged(IMode *mode);
void resetLayout();
void updateRunActions();
@@ -472,15 +467,6 @@ void AnalyzerManagerPrivate::selectSavedTool()
selectAction(m_actions.first());
}
void AnalyzerManagerPrivate::selectMenuAction()
{
AnalyzerManager::showMode();
AnalyzerAction *action = qobject_cast<AnalyzerAction *>(sender());
QTC_ASSERT(action, return);
selectAction(action);
startTool();
}
void AnalyzerManagerPrivate::selectToolboxAction(int index)
{
selectAction(m_actions[index]);
@@ -540,7 +526,13 @@ void AnalyzerManagerPrivate::addAction(AnalyzerAction *action)
m_actions.append(action);
m_toolBox->addItem(action->text());
m_toolBox->blockSignals(blocked);
connect(action, &QAction::triggered, this, &AnalyzerManagerPrivate::selectMenuAction);
connect(action, &QAction::triggered, this, [this, action] {
AnalyzerManager::showMode();
selectAction(action);
startTool();
});
m_toolBox->setEnabled(true);
}
@@ -643,10 +635,10 @@ QDockWidget *AnalyzerManager::createDockWidget(Core::Id toolId,
return dockWidget;
}
void AnalyzerManager::selectTool(Id toolId, StartMode mode)
void AnalyzerManager::selectTool(Id actionId)
{
foreach (AnalyzerAction *action, d->m_actions)
if (action->toolId() == toolId && action->startMode() == mode)
if (action->actionId() == actionId)
d->selectAction(action);
}