Refactor soft keys implementation.

Reviewed-by: Alessandro Portale

Squashed commit of the following:

commit dae5eda6996d48c12c4a5efd3f6042eb293bacbf
Author: Jason Barron <jbarron@trolltech.com>
Date:   Fri Sep 18 10:32:26 2009 +0200

    Only update soft keys when KEYPAD_NAVIGATION is enabled.

    For 4.6, let's just call these functions when keypad navigation is
    defined to minimize the impact on other platforms. They should
    probably get thier own define some day.

commit 30a730553531f0f138de5eddb30413936a34fa36
Author: Jason Barron <jbarron@trolltech.com>
Date:   Fri Sep 18 10:30:23 2009 +0200

    Add/remove the menu bar action when menu bar is added/removed.

commit a83343a2870b34c228c8bc5e6274607b0e97baf6
Author: Jason Barron <jbarron@trolltech.com>
Date:   Fri Sep 18 10:28:55 2009 +0200

    Compile fix for other platforms

commit 39c9e3a0a1d3d62bf6ebd3212cfd2a81b86b9b2a
Author: Jason Barron <jbarron@trolltech.com>
Date:   Thu Sep 17 21:37:59 2009 +0200

    Fix 'softkeys' example after API re-factoring.

    Clean up this example and use the simplified soft key API. Now the
    actions are only allocated in the constructor and dynamically updated
    by calling addAction and removeAction.

commit 314e45c33f40552db74e61755c2a3b0f8c77a41a
Author: Jason Barron <jbarron@trolltech.com>
Date:   Thu Sep 17 21:30:32 2009 +0200

    Re-factor and simplify the soft keys API.

    Several things here:
    - Move all the logic into QSoftKeyManager
    - Move the files into 'kernel' since it is not a widget
    - Remove QWidget::setSoftKey*(). Use addAction/removeAction instead
    - Made soft keys update on focus, window activation, and action
      changes.
    - Fixed several memory leaks where QAction's were created too often
    - QAction ownership pushed out to widget's
    - Added Select/Cancel soft keys for comboboxes and menus to be more
      consistent to platform look-and-feel.

commit fb4c240d970262e9872dc5737df6808879143c75
Author: Jason Barron <jbarron@trolltech.com>
Date:   Mon Sep 7 15:49:31 2009 +0200

    Merge the Symbian implementation with the other platforms nativeMenuBar

    It seems this has been refactored to share more code across the various
    platforms that support native menubars so the Symbian code can be
    mostly removed.

commit aa55e4bcd1f009ab35c9519e18aa325fd212dd23
Author: Jason Barron <jbarron@trolltech.com>
Date:   Wed Aug 26 17:00:34 2009 +0200

    Change filenames and move softkey stuff from 'widgets' to 'kernel'.

    This thing isn't a widget and therefore should not be in the 'widgets'
    subdirectory of gui. Also rename the files in preparation for
    refactoring and extending.

1 files changed, 13 insertions, 9 deletions

diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp
index 220f04e..0d710c4 100644
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
@@ -63,8 +63,8 @@
 #include <private/qcombobox_p.h>
 #include <private/qabstractitemmodel_p.h>
 #include <private/qabstractscrollarea_p.h>
+#include <private/qsoftkeymanager_p.h>
 #include <qdebug.h>
-#include <private/qactiontokeyeventmapper_p.h>
 #ifdef Q_WS_X11
 #include <private/qt_x11_p.h>
 #endif
@@ -402,6 +402,13 @@ QComboBoxPrivateContainer::QComboBoxPrivateContainer(QAbstractItemView *itemView
     layout->setSpacing(0);
     layout->setMargin(0);
 
+#ifdef QT_KEYPAD_NAVIGATION
+    selectAction = QSoftKeyManager::createKeyedAction(QAction::SelectSoftKey, Qt::Key_Select, itemView);
+    cancelAction = QSoftKeyManager::createKeyedAction(QAction::CancelSoftKey, Qt::Key_Escape, itemView);
+    addAction(selectAction);
+    addAction(cancelAction);
+#endif
+
     // set item view
     setItemView(itemView);
 
@@ -564,6 +571,11 @@ void QComboBoxPrivateContainer::setItemView(QAbstractItemView *itemView)
             this, SLOT(setCurrentIndex(QModelIndex)));
     connect(view, SIGNAL(destroyed()),
             this, SLOT(viewDestroyed()));
+
+#ifdef QT_KEYPAD_NAVIGATION
+    selectAction->setParent(itemView);
+    cancelAction->setParent(itemView);
+#endif
 }
 
 /*!
@@ -629,9 +641,6 @@ bool QComboBoxPrivateContainer::eventFilter(QObject *o, QEvent *e)
         case Qt::Key_Select:
 #endif
             if (view->currentIndex().isValid() && (view->currentIndex().flags() & Qt::ItemIsEnabled) ) {
-#ifdef QT_KEYPAD_NAVIGATION
-                QActionToKeyEventMapper::removeSoftkey(this);
-#endif
                 combo->hidePopup();
                 emit itemSelected(view->currentIndex());
             }
@@ -642,10 +651,6 @@ bool QComboBoxPrivateContainer::eventFilter(QObject *o, QEvent *e)
             // fall through
         case Qt::Key_F4:
         case Qt::Key_Escape:
-#ifdef QT_KEYPAD_NAVIGATION
-        case Qt::Key_Back:
-            QActionToKeyEventMapper::removeSoftkey(this);
-#endif
             combo->hidePopup();
             return true;
         default:
@@ -2477,7 +2482,6 @@ void QComboBox::showPopup()
 #ifdef QT_KEYPAD_NAVIGATION
     if (QApplication::keypadNavigationEnabled())
         view()->setEditFocus(true);
-    QActionToKeyEventMapper::addSoftKey(QAction::CancelSoftKey, Qt::Key_Back, view());
 #endif
 }