diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-23 12:45:51 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-23 12:47:06 +0200 |
commit | bf58826a1a7a8ded55a69537ee1a87a4a0554edc (patch) | |
tree | 44350ae750d54bd5fc4699da05930f52976c7d36 /src/gui/kernel/qplatforminputcontext_qpa.h | |
parent | 57bc4f255a737bfdcd40f2aba62fdf7ce9f2e967 (diff) |
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>
Diffstat (limited to 'src/gui/kernel/qplatforminputcontext_qpa.h')
-rw-r--r-- | src/gui/kernel/qplatforminputcontext_qpa.h | 22 |
1 files changed, 18 insertions, 4 deletions
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 |