Refactor the input framework

Results of the ongoing workshop in Oslo:
QInputPanel will be the application facing interface
for controlling the input context as well as querying
things like the position of the virtual keyboard.
QInputContext is significantly cleaned up and only there as
a compatibility API for existing code.

Change-Id: Ie8e2ee480930763f414bfaae63247b1fb6500c82
Reviewed-on: http://codereview.qt.nokia.com/4357
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

1 files changed, 7 insertions, 10 deletions

diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext_qpa.h
index 57694fe9d9..3bdce73019 100644
--- a/src/gui/kernel/qplatforminputcontext_qpa.h
+++ b/src/gui/kernel/qplatforminputcontext_qpa.h
@@ -42,7 +42,7 @@
 #ifndef QPLATFORMINPUTCONTEXT_H
 #define QPLATFORMINPUTCONTEXT_H
 
-#include <QtCore/QWeakPointer>
+#include <qinputpanel.h>
 
 QT_BEGIN_HEADER
 
@@ -60,17 +60,14 @@ public:
     virtual ~QPlatformInputContext();
 
     virtual void reset();
-    virtual void update();
+    virtual void update(Qt::InputMethodQueries);
+    virtual void invokeAction(QInputPanel::Action, int cursorPosition);
 
-    virtual void mouseHandler(int x, QMouseEvent *event);
+    virtual QRectF keyboardRect() const;
+    void emitKeyboardRectChanged() const;
 
-    QObject *focusObject() const;
-    virtual void setFocusObject(QObject *object);
-
-//    virtual QList<QAction *> actions();
-private:
-    QWeakPointer<QObject> m_focusObject;
-    QWeakPointer<QWindow> m_focusWindow;
+    virtual bool isAnimating();
+    void emitAnimatingChanged();
 };
 
 QT_END_NAMESPACE