1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix input context header.

Browse Source 
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>
This commit is contained in:
Friedemann Kleint 2011-08-23 12:45:51 +02:00
parent 57bc4f255a
commit bf58826a1a
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/kernel/qplatforminputcontext_qpa.cpp
View File

@ -40,12 +40,19 @@
****************************************************************************/ ****************************************************************************/
#include <qplatforminputcontext_qpa.h> #include <qplatforminputcontext_qpa.h>
#include <QtGui/QMouseEvent> #include <QtGui/QMouseEvent>
QT_BEGIN_NAMESPACE
QPlatformInputContext::QPlatformInputContext() QPlatformInputContext::QPlatformInputContext()
{ {
} }
QPlatformInputContext::~QPlatformInputContext()
{
}
void QPlatformInputContext::reset() void QPlatformInputContext::reset()
{ {
} }
@ -64,10 +71,12 @@ void QPlatformInputContext::mouseHandler(int, QMouseEvent *event)
QObject *QPlatformInputContext::focusObject() const 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

22
src/gui/kernel/qplatforminputcontext_qpa.h
View File

@ -42,13 +42,22 @@
#ifndef QPLATFORMINPUTCONTEXT_H #ifndef QPLATFORMINPUTCONTEXT_H
#define 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 QMouseEvent;
class Q_GUI_EXPORT QPlatformInputContext class Q_GUI_EXPORT QPlatformInputContext
{ {
public: public:
QPlatformInputContext(); QPlatformInputContext();
virtual ~QPlatformInputContext();
virtual void reset(); virtual void reset();
virtual void update(); virtual void update();
@ -56,11 +65,16 @@ public:
virtual void mouseHandler(int x, QMouseEvent *event); virtual void mouseHandler(int x, QMouseEvent *event);
QObject *focusObject() const; QObject *focusObject() const;
virtual void setFocusObject(QObject *o); virtual void setFocusObject(QObject *object);
// virtual QList<QAction *> actions(); // virtual QList<QAction *> actions();
private: private:
QWeakPointer<QObject> focus; QWeakPointer<QObject> m_focusObject;
QWeakPointer<QWindow> m_focusWindow;
}; };
#endif QT_END_NAMESPACE
QT_END_HEADER
#endif // QPLATFORMINPUTCONTEXT_H