From dc08efac6f1dc3cf9a1a79e4338c6eacd74d8b86 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Thu, 26 Feb 2015 11:28:37 +0100
Subject: [PATCH] Analyzer: Slightly simplify combobox tool action selection

Change-Id: I34e22eee1f0cfaa1f248d814754b14f6004e4fce
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
---
 src/plugins/analyzerbase/analyzermanager.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp
index 7d73a347e83..93a2f1d8343 100644
--- a/src/plugins/analyzerbase/analyzermanager.cpp
+++ b/src/plugins/analyzerbase/analyzermanager.cpp
@@ -151,7 +151,7 @@ public:
     void saveToolSettings(Id toolId);
     void loadToolSettings(Id toolId);
     void startTool();
-    void selectToolboxAction(int);
+    void selectToolboxAction(const QString &item);
     void modeChanged(IMode *mode);
     void resetLayout();
     void updateRunActions();
@@ -196,7 +196,7 @@ AnalyzerManagerPrivate::AnalyzerManagerPrivate(AnalyzerManager *qq):
     m_statusLabel(new StatusLabel)
 {
     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);
 
     setupActions();
@@ -454,18 +454,16 @@ void AnalyzerManagerPrivate::selectSavedTool()
         selectAction(m_actions.first());
 }
 
-void AnalyzerManagerPrivate::selectToolboxAction(int index)
+void AnalyzerManagerPrivate::selectToolboxAction(const QString &item)
 {
-    AnalyzerAction * const action  = Utils::findOrDefault(m_actions,
-            [this, index](const AnalyzerAction *action) {
-                return action->text() == m_toolBox->itemText(index);
-            });
-    QTC_ASSERT(action, return);
-    selectAction(action);
+    selectAction(Utils::findOrDefault(m_actions, [item](const AnalyzerAction *action) {
+        return action->text() == item;
+    }));
 }
 
 void AnalyzerManagerPrivate::selectAction(AnalyzerAction *action)
 {
+    QTC_ASSERT(action, return);
     if (m_currentAction == action)
         return;