diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-10-22 00:51:04 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-10-22 00:51:04 (GMT) |
| commit | 61836f454fd49286bce038c386eb8921b88450da (patch) | |
| tree | 781ad19d08c6aedc1bdc8beb988c38f86013f8cd /src/gui/inputmethod/qinputcontext.h | |
| parent | 493ce4c0aa1c7dc73206917b1a6874e77b7385d9 (diff) | |
| parent | 26eda5fa33e401a1803b42e6eacf0921ddc6a14e (diff) | |
| download | Qt-61836f454fd49286bce038c386eb8921b88450da.zip Qt-61836f454fd49286bce038c386eb8921b88450da.tar.gz Qt-61836f454fd49286bce038c386eb8921b88450da.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/inputmethod/qinputcontext.h')
| -rw-r--r-- | src/gui/inputmethod/qinputcontext.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/gui/inputmethod/qinputcontext.h b/src/gui/inputmethod/qinputcontext.h index 73b05d8..14096e3 100644 --- a/src/gui/inputmethod/qinputcontext.h +++ b/src/gui/inputmethod/qinputcontext.h @@ -67,10 +67,6 @@ QT_BEGIN_HEADER -#ifdef Q_WS_S60 -class TWsEvent; -#endif - QT_BEGIN_NAMESPACE QT_MODULE(Gui) @@ -79,6 +75,9 @@ class QWidget; class QFont; class QPopupMenu; class QInputContextPrivate; +#ifdef Q_OS_SYMBIAN +class QSymbianEvent; +#endif class Q_GUI_EXPORT QInputContext : public QObject { @@ -108,9 +107,9 @@ public: #if defined(Q_WS_X11) virtual bool x11FilterEvent( QWidget *keywidget, XEvent *event ); #endif // Q_WS_X11 -#if defined(Q_WS_S60) - virtual bool s60FilterEvent( QWidget *keywidget, TWsEvent *event ); -#endif // Q_WS_S60 +#if defined(Q_OS_SYMBIAN) + virtual bool symbianFilterEvent( QWidget *keywidget, const QSymbianEvent *event ); +#endif // Q_OS_SYMBIAN virtual bool filterEvent( const QEvent *event ); void sendEvent(const QInputMethodEvent &event); |