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, 3 insertions, 9 deletions

diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index ad1c842..138ba8c 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -29,8 +29,6 @@
 #include "private/qwindowsurface_s60_p.h"
 #include "qpaintengine.h"
 #include "qmenubar.h"
-#include "qmainwindow.h"
-#include "qsoftkeystack.h"
 #include "private/qsoftkeystack_p.h"
 
 #include "apgwgnam.h" // For CApaWindowGroupName
@@ -1041,14 +1039,10 @@ void QApplication::s60HandleCommandL(int command)
         exit();
         break;
     default:
-        if (command >= SOFTKEYSTART && command <= SOFTKEYEND) {
-            const QMainWindow *activeMainWindow =
-                qobject_cast<const QMainWindow*>(QApplication::activeWindow());
-            if (activeMainWindow)
-                activeMainWindow->softKeyStack()->handleSoftKeyPress(command);
-        } else {
+        if (command >= SOFTKEYSTART && command <= SOFTKEYEND)
+            QSoftKeyStackPrivate::handleSoftKeyPress(command);
+        else
             QMenuBar::symbianCommands(command);
-        }
         break;
     }
 }