diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-21 12:32:52 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-21 12:32:52 (GMT) |
| commit | 5c319b2ec940e34d2d5102c804b84c66e8ae66f1 (patch) | |
| tree | ce1a995ad45d89575bc9a6ac3cdadb083b5ad95a /src/gui/inputmethod/qinputcontext.h | |
| parent | 4279889ebebb9fdd026fc107f60f825fb2ad565e (diff) | |
| parent | 522fc01a18b9eae80b733befb98a948f0fbbba06 (diff) | |
| download | Qt-5c319b2ec940e34d2d5102c804b84c66e8ae66f1.zip Qt-5c319b2ec940e34d2d5102c804b84c66e8ae66f1.tar.gz Qt-5c319b2ec940e34d2d5102c804b84c66e8ae66f1.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-driven
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); |