From 3e65c9db09efd749d2de9dfa433cb9489b4a0679 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 19 Jul 2016 22:49:26 +0300
Subject: [PATCH] CppEditor: Replace QSignalMapper with a lambda

Change-Id: I403a5f9bb29240181a98390dd4cd8e34110957ee
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
---
 src/plugins/cppeditor/cppeditor.cpp | 16 +---------------
 src/plugins/cppeditor/cppeditor.h   |  2 --
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 63d964af9e5..c26a8b25f1a 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -84,7 +84,6 @@
 #include <QFutureWatcher>
 #include <QMenu>
 #include <QPointer>
-#include <QSignalMapper>
 #include <QTextEdit>
 #include <QTimer>
 #include <QToolButton>
@@ -120,7 +119,6 @@ public:
     CppLocalRenaming m_localRenaming;
 
     SemanticInfo m_lastSemanticInfo;
-    QuickFixOperations m_quickFixes;
 
     CppUseSelectionsUpdater m_useSelectionsUpdater;
 
@@ -677,11 +675,6 @@ bool CppEditorWidget::event(QEvent *e)
     return TextEditorWidget::event(e);
 }
 
-void CppEditorWidget::performQuickFix(int index)
-{
-    d->m_quickFixes.at(index)->perform();
-}
-
 void CppEditorWidget::processKeyNormally(QKeyEvent *e)
 {
     TextEditorWidget::keyPressEvent(e);
@@ -700,9 +693,6 @@ void CppEditorWidget::contextMenuEvent(QContextMenuEvent *e)
     QMenu *quickFixMenu = new QMenu(tr("&Refactor"), menu);
     quickFixMenu->addAction(ActionManager::command(Constants::RENAME_SYMBOL_UNDER_CURSOR)->action());
 
-    QSignalMapper mapper;
-    connect(&mapper, static_cast<void (QSignalMapper::*)(int)>(&QSignalMapper::mapped),
-            this, &CppEditorWidget::performQuickFix);
     if (isSemanticInfoValidExceptLocalUses()) {
         d->m_useSelectionsUpdater.update(CppUseSelectionsUpdater::Synchronous);
         AssistInterface *interface = createAssistInterface(QuickFix, ExplicitlyInvoked);
@@ -715,11 +705,8 @@ void CppEditorWidget::contextMenuEvent(QContextMenuEvent *e)
                 for (int index = 0; index < model->size(); ++index) {
                     auto item = static_cast<AssistProposalItem *>(model->proposalItem(index));
                     QuickFixOperation::Ptr op = item->data().value<QuickFixOperation::Ptr>();
-                    d->m_quickFixes.append(op);
                     QAction *action = quickFixMenu->addAction(op->description());
-                    mapper.setMapping(action, index);
-                    connect(action, &QAction::triggered,
-                            &mapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
+                    connect(action, &QAction::triggered, this, [op] { op->perform(); });
                 }
                 delete model;
             }
@@ -737,7 +724,6 @@ void CppEditorWidget::contextMenuEvent(QContextMenuEvent *e)
     menu->exec(e->globalPos());
     if (!menu)
         return;
-    d->m_quickFixes.clear();
     delete menu;
 }
 
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index 626b16ab943..7fb26e93c36 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -126,8 +126,6 @@ private:
                             bool updateUseSelectionSynchronously = false);
     void updatePreprocessorButtonTooltip();
 
-    void performQuickFix(int index);
-
     void processKeyNormally(QKeyEvent *e);
 
     void finalizeInitialization() override;