Cleaned up the API of the Symbian event hooks.

The two major points were:
- Replacing "s60" with "symbian" in all event handling functions,
  since there is nothing S60-specific about them.
- Replace the Symbian event types with the encapsulating
  QSymbianEvent container. This allows us to cope with more types of
  events in the future without having to add new virtual functions.

AutoTest: QWidget passed
Task:     QT-1156
RevBy:    Jason Barron
RevBy:    Shane Kearns
RevBy:    Sami Merila

2 files changed, 13 insertions, 14 deletions

diff --git a/src/gui/inputmethod/qinputcontext.cpp b/src/gui/inputmethod/qinputcontext.cpp
index 8ee417f..ea6ed35 100644
--- a/src/gui/inputmethod/qinputcontext.cpp
+++ b/src/gui/inputmethod/qinputcontext.cpp
@@ -467,32 +467,32 @@ bool QInputContext::x11FilterEvent(QWidget * /*keywidget*/, XEvent * /*event*/)
 }
 #endif // Q_WS_X11
 
-#ifdef Q_WS_S60
+#ifdef Q_OS_SYMBIAN
 /*!
     \since 4.6
 
     This function may be overridden only if input method is depending
-    on Symbian and you need raw TWsEvent. Otherwise, this function must not.
+    on Symbian and you need raw Symbian events. Otherwise, this function must not.
 
-    This function is designed to filter raw key events on S60, but
+    This function is designed to filter raw key events on Symbian, but
     other input methods may use this to implement some special
     features.
 
     Return true if the \a event has been consumed. Otherwise, the
     unfiltered \a event will be translated into QEvent and forwarded
-    to filterEvent(). Filtering at both s60FilterEvent() and
+    to filterEvent(). Filtering at both symbianFilterEvent() and
     filterEvent() in single input method is allowed.
 
     \a keywidget is a client widget into which a text is inputted. \a
-    event is inputted TWsEvent.
+    event is inputted QSymbianEvent.
 
     \sa filterEvent()
 */
-bool QInputContext::s60FilterEvent(QWidget * /*keywidget*/, TWsEvent * /*event*/)
+bool QInputContext::symbianFilterEvent(QWidget * /*keywidget*/, const QSymbianEvent * /*event*/)
 {
     return false;
 }
-#endif // Q_WS_S60
+#endif // Q_OS_SYMBIAN
 
 QT_END_NAMESPACE
 
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);