From bf58826a1a7a8ded55a69537ee1a87a4a0554edc Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 23 Aug 2011 12:45:51 +0200
Subject: Fix input context header.

Rubber-stamped-by: Lars Knoll <lars.knoll@nokia.com>

Change-Id: Ia5dfccfa53fea68889c312a645597aaf40ddc079
Reviewed-on: http://codereview.qt.nokia.com/3397
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/gui/kernel/qplatforminputcontext_qpa.cpp | 15 ++++++++++++---
 src/gui/kernel/qplatforminputcontext_qpa.h   | 22 ++++++++++++++++++----
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext_qpa.cpp
index dd4bee7b5b..4ef25ddbe5 100644
--- a/src/gui/kernel/qplatforminputcontext_qpa.cpp
+++ b/src/gui/kernel/qplatforminputcontext_qpa.cpp
@@ -40,12 +40,19 @@
 ****************************************************************************/
 
 #include <qplatforminputcontext_qpa.h>
+
 #include <QtGui/QMouseEvent>
 
+QT_BEGIN_NAMESPACE
+
 QPlatformInputContext::QPlatformInputContext()
 {
 }
 
+QPlatformInputContext::~QPlatformInputContext()
+{
+}
+
 void QPlatformInputContext::reset()
 {
 }
@@ -64,10 +71,12 @@ void QPlatformInputContext::mouseHandler(int, QMouseEvent *event)
 
 QObject *QPlatformInputContext::focusObject() const
 {
-    return focus.data();
+    return m_focusObject.data();
 }
 
-void QPlatformInputContext::setFocusObject(QObject *o)
+void QPlatformInputContext::setFocusObject(QObject *object)
 {
-    focus = o;
+    m_focusObject = object;
 }
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext_qpa.h
index f39d974172..57694fe9d9 100644
--- a/src/gui/kernel/qplatforminputcontext_qpa.h
+++ b/src/gui/kernel/qplatforminputcontext_qpa.h
@@ -42,13 +42,22 @@
 #ifndef QPLATFORMINPUTCONTEXT_H
 #define QPLATFORMINPUTCONTEXT_H
 
-#include <qsharedpointer.h>
+#include <QtCore/QWeakPointer>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
+
+class QWindow;
 class QMouseEvent;
 
 class Q_GUI_EXPORT QPlatformInputContext
 {
 public:
     QPlatformInputContext();
+    virtual ~QPlatformInputContext();
 
     virtual void reset();
     virtual void update();
@@ -56,11 +65,16 @@ public:
     virtual void mouseHandler(int x, QMouseEvent *event);
 
     QObject *focusObject() const;
-    virtual void setFocusObject(QObject *o);
+    virtual void setFocusObject(QObject *object);
 
 //    virtual QList<QAction *> actions();
 private:
-    QWeakPointer<QObject> focus;
+    QWeakPointer<QObject> m_focusObject;
+    QWeakPointer<QWindow> m_focusWindow;
 };
 
-#endif
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QPLATFORMINPUTCONTEXT_H
-- 
cgit v1.2.3