Core: Remove slot-by-name reference

Replace by lambda.

Change-Id: I50a4a8b6db9790d06b3f60f5de7691b85f54995c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

src/plugins/coreplugin/editormanager/editormanager.cpp

@@ -2985,10 +2985,12 @@ bool EditorManager::restoreState(const QByteArray &state)
 void EditorManager::showEditorStatusBar(const QString &id,
                                         const QString &infoText,
                                         const QString &buttonText,
-                                      QObject *object, const char *member)
+                                        QObject *object,
+                                        const std::function<void()> &function)
 {
 
-    EditorManagerPrivate::currentEditorView()->showEditorStatusBar(id, infoText, buttonText, object, member);
+    EditorManagerPrivate::currentEditorView()->showEditorStatusBar(
+                id, infoText, buttonText, object, function);
 }
 
 void EditorManager::hideEditorStatusBar(const QString &id)

src/plugins/coreplugin/editormanager/editormanager.h

@@ -154,7 +154,8 @@ public:
     static void showEditorStatusBar(const QString &id,
                                     const QString &infoText,
                                     const QString &buttonText = QString(),
-                           QObject *object = 0, const char *member = 0);
+                                    QObject *object = nullptr,
+                                    const std::function<void()> &function = nullptr);
     static void hideEditorStatusBar(const QString &id);
 
     static EditorFactoryList editorFactories(const Utils::MimeType &mimeType, bool bestMatchOnly = true);

src/plugins/coreplugin/editormanager/editorview.cpp

@@ -218,15 +218,15 @@ void EditorView::closeCurrentEditor()
 void EditorView::showEditorStatusBar(const QString &id,
                                      const QString &infoText,
                                      const QString &buttonText,
-                                     QObject *object, const char *member)
+                                     QObject *object, const std::function<void()> &function)
 {
     m_statusWidgetId = id;
     m_statusWidgetLabel->setText(infoText);
     m_statusWidgetButton->setText(buttonText);
     m_statusWidgetButton->setToolTip(buttonText);
     m_statusWidgetButton->disconnect();
-    if (object && member)
+    if (object && function)
-        connect(m_statusWidgetButton, SIGNAL(clicked()), object, member);
+        connect(m_statusWidgetButton, &QToolButton::clicked, object, function);
     m_statusWidget->setVisible(true);
     m_statusHLine->setVisible(true);
     //m_editorForInfoWidget = currentEditor();

src/plugins/coreplugin/editormanager/editorview.h

@@ -38,6 +38,8 @@
 #include <QIcon>
 #include <QWidget>
 
+#include <functional>
+
 QT_BEGIN_NAMESPACE
 class QAction;
 class QComboBox;
@@ -95,7 +97,7 @@ public:
     void showEditorStatusBar(const QString &id,
                            const QString &infoText,
                            const QString &buttonText,
-                           QObject *object, const char *member);
+                           QObject *object, const std::function<void()> &function);
     void hideEditorStatusBar(const QString &id);
     void setCloseSplitEnabled(bool enable);
     void setCloseSplitIcon(const QIcon &icon);

src/plugins/macros/macromanager.cpp

@@ -287,10 +287,9 @@ void MacroManager::startMacro()
     QString executeShortcut = Core::ActionManager::command(Constants::EXECUTE_LAST_MACRO)->keySequence().toString();
     QString help = tr("Macro mode. Type \"%1\" to stop recording and \"%2\" to play the macro.")
         .arg(endShortcut).arg(executeShortcut);
-    Core::EditorManager::showEditorStatusBar(
+    Core::EditorManager::showEditorStatusBar(Constants::M_STATUS_BUFFER, help,
-                QLatin1String(Constants::M_STATUS_BUFFER),
+                                             tr("Stop Recording Macro"),
-                help,
+                                             this, [this] { endMacro(); });
-                tr("Stop Recording Macro"), this, SLOT(endMacro()));
 }
 
 void MacroManager::endMacro()

src/plugins/macros/macromanager.h

@@ -56,8 +56,6 @@ public:
     void executeLastMacro();
     void saveLastMacro();
     bool executeMacro(const QString &name);
-
-public slots:
     void endMacro();
 
 protected: