From 42fbf668b6da3251aea2ce27a25882437b9a4a06 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <aportale@trolltech.com>
Date: Fri, 29 May 2009 16:40:27 +0200
Subject: Pulled helper menuActionList() out of
 QSoftKeyStack::handleFocusChanged. It is also needed in other places.

---
 src/gui/widgets/qsoftkeystack.cpp | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/gui/widgets/qsoftkeystack.cpp b/src/gui/widgets/qsoftkeystack.cpp
index 984922e..c07dd9e 100644
--- a/src/gui/widgets/qsoftkeystack.cpp
+++ b/src/gui/widgets/qsoftkeystack.cpp
@@ -177,6 +177,21 @@ bool QSoftKeyStack::isEmpty()
     return d->isEmpty();
 }
 
+QList<QSoftKeyAction*> menuActionList(QWidget *widget)
+{
+    QList<QSoftKeyAction*> result;
+
+    QSoftKeyAction* menu = new QSoftKeyAction(QSoftKeyAction::Menu, QString::fromLatin1("Menu"), widget);
+    result.append(menu);
+    const Qt::ContextMenuPolicy policy = widget->contextMenuPolicy();
+    if (policy != Qt::NoContextMenu && policy != Qt::PreventContextMenu ) {
+        QSoftKeyAction* contextMenu = new QSoftKeyAction(QSoftKeyAction::ContextMenu, QString::fromLatin1("ContextMenu"), widget);
+        result.append(contextMenu);
+    }
+
+    return result;
+}
+
 void QSoftKeyStack::handleFocusChanged(QWidget *old, QWidget *now)
 {
     if (!now)
@@ -188,17 +203,8 @@ void QSoftKeyStack::handleFocusChanged(QWidget *old, QWidget *now)
     if (!mainWindow->hasSoftKeyStack())
         return;
     QSoftKeyStack* softKeyStack = mainWindow->softKeyStack();
-    if( mainWindow->menuWidget() )
-    {
-        QList<QSoftKeyAction*> actionList;
-        QSoftKeyAction* menu = new QSoftKeyAction(QSoftKeyAction::Menu, QString::fromLatin1("Menu"), now);
-        actionList.append(menu);
-    
-        Qt::ContextMenuPolicy policy = now->contextMenuPolicy();
-        if (policy != Qt::NoContextMenu && policy != Qt::PreventContextMenu ) {
-            QSoftKeyAction* contextMenu = new QSoftKeyAction(QSoftKeyAction::ContextMenu, QString::fromLatin1("ContextMenu"), now);
-            actionList.append(contextMenu);
-        }
+    if (mainWindow->menuWidget()) {
+        QList<QSoftKeyAction*> actionList = menuActionList(now);
         if (old)
             softKeyStack->popandPush(actionList);
         else
-- 
cgit v0.12