Qt Designer: Refactor QDesignerActions::fixActionContext()

Remove member function in favor of a static function that
iterates over each action group instead of compiling a list
of all actions just for that purpose.
Prepares the introduction of QT_NO_FOREACH.

Change-Id: If386ac7fc98bebec6d458318c8ec8edd8d4fb93c
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 13 insertions, 16 deletions

diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index 77f30e736..ae184caf7 100644
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -113,6 +113,12 @@ static QActionGroup *createActionGroup(QObject *parent, bool exclusive = false)
     return rc;
 }
 
+static void fixActionContext(const QList<QAction *> &actions)
+{
+    for (QAction *a : actions)
+        a->setShortcutContext(Qt::ApplicationShortcut);
+}
+
 static inline QString savedMessage(const QString &fileName)
 {
     return QDesignerActions::tr("Saved %1.").arg(fileName);
@@ -419,7 +425,13 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench)
 //
 // connections
 //
-    fixActionContext();
+    fixActionContext(m_fileActions->actions());
+    fixActionContext(m_editActions->actions());
+    fixActionContext(m_toolActions->actions());
+    fixActionContext(m_formActions->actions());
+    fixActionContext(m_windowActions->actions());
+    fixActionContext(m_helpActions->actions());
+
     activeFormWindowChanged(core()->formWindowManager()->activeFormWindow());
 
     m_backupTimer->start(180000); // 3min
@@ -731,21 +743,6 @@ void  QDesignerActions::viewCode()
         QMessageBox::warning(fw, tr("Code generation failed"), errorMessage);
 }
 
-void QDesignerActions::fixActionContext()
-{
-    QList<QAction*> actions;
-    actions += m_fileActions->actions();
-    actions += m_editActions->actions();
-    actions += m_toolActions->actions();
-    actions += m_formActions->actions();
-    actions += m_windowActions->actions();
-    actions += m_helpActions->actions();
-
-    foreach (QAction *a, actions) {
-        a->setShortcutContext(Qt::ApplicationShortcut);
-    }
-}
-
 bool QDesignerActions::readInForm(const QString &fileName)
 {
     QString fn = fileName;