From e470bdc018915f6b3f0e268c5c1eae3d944f9bea Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sat, 12 Nov 2022 21:57:26 +0100
Subject: [PATCH] Gui: replace old-style with new-style connect

---
 src/Gui/Action.cpp     | 16 ++++++----------
 src/Gui/MainWindow.cpp | 15 +++++++++++++++
 src/Gui/MainWindow.h   | 11 +++++++++++
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp
index e0d422b2b1..df526a54d1 100644
--- a/src/Gui/Action.cpp
+++ b/src/Gui/Action.cpp
@@ -649,8 +649,6 @@ void WorkbenchComboBox::onActivated(int i)
     int index = itemData(i).toInt();
     auto ev = new WorkbenchActionEvent(this->actions().at(index));
     QApplication::postEvent(this->group, ev);
-    // TODO: Test if we can use this instead
-    //QTimer::singleShot(20, this->actions()[i], SLOT(trigger()));
 }
 
 void WorkbenchComboBox::onActivated(QAction* action)
@@ -1358,9 +1356,9 @@ DockWidgetAction::~DockWidgetAction()
 void DockWidgetAction::addTo ( QWidget * w )
 {
     if (!_menu) {
-      _menu = new QMenu();
-      _action->setMenu(_menu);
-      connect(_menu, SIGNAL(aboutToShow()), getMainWindow(), SLOT(onDockWindowMenuAboutToShow()));
+        _menu = new QMenu();
+        _action->setMenu(_menu);
+        getMainWindow()->setDockWindowMenu(_menu);
     }
 
     w->addAction(_action);
@@ -1383,7 +1381,7 @@ void ToolBarAction::addTo ( QWidget * w )
     if (!_menu) {
       _menu = new QMenu();
       _action->setMenu(_menu);
-      connect(_menu, SIGNAL(aboutToShow()), getMainWindow(), SLOT(onToolBarMenuAboutToShow()));
+      getMainWindow()->setToolBarMenu(_menu);
     }
 
     w->addAction(_action);
@@ -1408,16 +1406,14 @@ void WindowAction::addTo ( QWidget * w )
             _menu = new QMenu();
             _action->setMenu(_menu);
             _menu->addActions(_group->actions());
-            connect(_menu, SIGNAL(aboutToShow()),
-                    getMainWindow(), SLOT(onWindowsMenuAboutToShow()));
+            getMainWindow()->setWindowsMenu(_menu);
         }
 
         w->addAction(_action);
     }
     else {
         menu->addActions(_group->actions());
-        connect(menu, SIGNAL(aboutToShow()),
-                getMainWindow(), SLOT(onWindowsMenuAboutToShow()));
+        getMainWindow()->setWindowsMenu(menu);
     }
 }
 
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index c4204b2cd7..6d2d59be25 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -1165,6 +1165,21 @@ void MainWindow::onDockWindowMenuAboutToShow()
     }
 }
 
+void MainWindow::setDockWindowMenu(QMenu* menu)
+{
+    connect(menu, &QMenu::aboutToShow, this, &MainWindow::onDockWindowMenuAboutToShow);
+}
+
+void MainWindow::setToolBarMenu(QMenu* menu)
+{
+    connect(menu, &QMenu::aboutToShow, this, &MainWindow::onToolBarMenuAboutToShow);
+}
+
+void MainWindow::setWindowsMenu(QMenu* menu)
+{
+    connect(menu, &QMenu::aboutToShow, this, &MainWindow::onWindowsMenuAboutToShow);
+}
+
 QList<QWidget*> MainWindow::windows(QMdiArea::WindowOrder order) const
 {
     QList<QWidget*> mdis;
diff --git a/src/Gui/MainWindow.h b/src/Gui/MainWindow.h
index 5fc53e8363..11b37aaff0 100644
--- a/src/Gui/MainWindow.h
+++ b/src/Gui/MainWindow.h
@@ -156,6 +156,17 @@ public:
     void saveWindowSettings();
     //@}
 
+    /** @name Menu
+     */
+    //@{
+    /// Set menu for dock windows.
+    void setDockWindowMenu(QMenu*);
+    /// Set menu for toolbars.
+    void setToolBarMenu(QMenu*);
+    /// Set menu for sub-windows
+    void setWindowsMenu(QMenu*);
+    //@}
+
     /** @name MIME data handling
      */
     //@{