Moved the soft key command relay acrobatics from QApplication to

QSoftKeyStackPrivate. Removed QSoftKeyStack::handleSoftKeyPress
and made QSoftKeyStackPrivate::handleSoftKeyPress static, so that
it can be called from QApplication.

1 files changed, 10 insertions, 2 deletions

diff --git a/src/gui/widgets/qsoftkeystack_s60.cpp b/src/gui/widgets/qsoftkeystack_s60.cpp
index e9ca13a..8dfd5dd 100644
--- a/src/gui/widgets/qsoftkeystack_s60.cpp
+++ b/src/gui/widgets/qsoftkeystack_s60.cpp
@@ -48,6 +48,8 @@
 #include "private/qcore_symbian_p.h"
 
 #include "qsoftkeystack_p.h"
+#include "qapplication.h"
+#include "qmainwindow.h"
 
 void QSoftKeyStackPrivate::mapSoftKeys(const QSoftkeySet &top)
 {
@@ -99,9 +101,15 @@ void QSoftKeyStackPrivate::setNativeSoftKeys()
 
 void QSoftKeyStackPrivate::handleSoftKeyPress(int command)
 {
-    const QSoftkeySet top = softKeyStack.top();
+    const QMainWindow *activeMainWindow =
+        qobject_cast<const QMainWindow*>(QApplication::activeWindow());
+    if (!activeMainWindow)
+        return;
+    QSoftKeyStackPrivate *d_ptr = activeMainWindow->softKeyStack()->d_func();
+
+    const QSoftkeySet top = d_ptr->softKeyStack.top();
     int index = command-SOFTKEYSTART;
-    if( index<0 || index>=top.count()){
+    if (index < 0 || index >= top.count()) {
         // ### FIX THIS, add proper error handling, now fail quietly
         return;
     }