6 files changed, 19 insertions, 17 deletions

diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 9c28b7045d..53fd3ec9dc 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -2983,12 +2983,14 @@ bool EditorManager::restoreState(const QByteArray &state)
 }
 
 void EditorManager::showEditorStatusBar(const QString &id,
-                                      const QString &infoText,
-                                      const QString &buttonText,
-                                      QObject *object, const char *member)
+                                        const QString &infoText,
+                                        const QString &buttonText,
+                                        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)
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index 8d4908e1de..5c8c37113d 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -152,9 +152,10 @@ public:
     static bool hasSplitter();
 
     static void showEditorStatusBar(const QString &id,
-                           const QString &infoText,
-                           const QString &buttonText = QString(),
-                           QObject *object = 0, const char *member = 0);
+                                    const QString &infoText,
+                                    const QString &buttonText = QString(),
+                                    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);
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index 4bbad3ff42..99556068e1 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/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)
-        connect(m_statusWidgetButton, SIGNAL(clicked()), object, member);
+    if (object && function)
+        connect(m_statusWidgetButton, &QToolButton::clicked, object, function);
     m_statusWidget->setVisible(true);
     m_statusHLine->setVisible(true);
     //m_editorForInfoWidget = currentEditor();
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index df0a62a9cb..abeb0f125e 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/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);
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp
index cfda1684ff..81fe1c4d41 100644
--- a/src/plugins/macros/macromanager.cpp
+++ b/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(
-                QLatin1String(Constants::M_STATUS_BUFFER),
-                help,
-                tr("Stop Recording Macro"), this, SLOT(endMacro()));
+    Core::EditorManager::showEditorStatusBar(Constants::M_STATUS_BUFFER, help,
+                                             tr("Stop Recording Macro"),
+                                             this, [this] { endMacro(); });
 }
 
 void MacroManager::endMacro()
diff --git a/src/plugins/macros/macromanager.h b/src/plugins/macros/macromanager.h
index efc3bac605..9fb6cb18ad 100644
--- a/src/plugins/macros/macromanager.h
+++ b/src/plugins/macros/macromanager.h
@@ -56,8 +56,6 @@ public:
     void executeLastMacro();
     void saveLastMacro();
     bool executeMacro(const QString &name);
-
-public slots:
     void endMacro();
 
 protected: