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

Analyzer: Slightly simplify combobox tool action selection

Browse Source 
Change-Id: I34e22eee1f0cfaa1f248d814754b14f6004e4fce
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
hjk
2015-02-26 11:28:37 +01:00
parent f72109a189
commit dc08efac6f
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,7 +151,7 @@ public:
void saveToolSettings(Id toolId); void saveToolSettings(Id toolId);
void loadToolSettings(Id toolId); void loadToolSettings(Id toolId);
void startTool(); void startTool();
void selectToolboxAction(int); void selectToolboxAction(const QString &item);
void modeChanged(IMode *mode); void modeChanged(IMode *mode);
void resetLayout(); void resetLayout();
void updateRunActions(); void updateRunActions();
@@ -196,7 +196,7 @@ AnalyzerManagerPrivate::AnalyzerManagerPrivate(AnalyzerManager *qq):
m_statusLabel(new StatusLabel) m_statusLabel(new StatusLabel)
{ {
m_toolBox->setObjectName(QLatin1String("AnalyzerManagerToolBox")); m_toolBox->setObjectName(QLatin1String("AnalyzerManagerToolBox"));
connect(m_toolBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), connect(m_toolBox, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated),
this, &AnalyzerManagerPrivate::selectToolboxAction); this, &AnalyzerManagerPrivate::selectToolboxAction);
setupActions(); setupActions();
@@ -454,18 +454,16 @@ void AnalyzerManagerPrivate::selectSavedTool()
selectAction(m_actions.first()); selectAction(m_actions.first());
} }
void AnalyzerManagerPrivate::selectToolboxAction(int index) void AnalyzerManagerPrivate::selectToolboxAction(const QString &item)
{ {
AnalyzerAction * const action = Utils::findOrDefault(m_actions, selectAction(Utils::findOrDefault(m_actions, [item](const AnalyzerAction *action) {
[this, index](const AnalyzerAction *action) { return action->text() == item;
return action->text() == m_toolBox->itemText(index); }));
});
QTC_ASSERT(action, return);
selectAction(action);
} }
void AnalyzerManagerPrivate::selectAction(AnalyzerAction *action) void AnalyzerManagerPrivate::selectAction(AnalyzerAction *action)
{ {
QTC_ASSERT(action, return);
if (m_currentAction == action) if (m_currentAction == action)
return; return;