diff options
author | Alessandro Portale <aportale@trolltech.com> | 2009-05-27 20:47:19 (GMT) |
---|---|---|
committer | Alessandro Portale <aportale@trolltech.com> | 2009-05-27 20:47:19 (GMT) |
commit | 8c7098210e6dfa7886d6e33918899a211019b699 (patch) | |
tree | ce3dc0ea52772b3d2f50f9ebda24886a984771a7 /src/gui/kernel/qapplication_s60.cpp | |
parent | 51d580aef7fce99a7c531fa35e50637ec8704a5d (diff) | |
download | Qt-8c7098210e6dfa7886d6e33918899a211019b699.zip Qt-8c7098210e6dfa7886d6e33918899a211019b699.tar.gz Qt-8c7098210e6dfa7886d6e33918899a211019b699.tar.bz2 |
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.
Diffstat (limited to 'src/gui/kernel/qapplication_s60.cpp')
-rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 12 |
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; } } |