aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickevents_p_p.h
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2016-07-07 21:56:18 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2016-07-08 11:26:13 +0000
commit8185e52960ae96c963b663b94cb0a782e7441ae6 (patch)
tree0c9d110bab3cde3adbcb4e8ca807b17749951bb9 /src/quick/items/qquickevents_p_p.h
parenta0769ccff089f9699579448136a12504fa25cd47 (diff)
QQuickPointerEvent::reset move to .cpp file
Change-Id: Ib84d9fe2a3837f4f37087f7802eeb7570bb2baf7 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickevents_p_p.h')
-rw-r--r--src/quick/items/qquickevents_p_p.h43
1 files changed, 2 insertions, 41 deletions
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h
index c0f2631096..a1813f368b 100644
--- a/src/quick/items/qquickevents_p_p.h
+++ b/src/quick/items/qquickevents_p_p.h
@@ -395,47 +395,8 @@ public:
, m_pressedButtons(Qt::NoButton)
, m_mousePoint(nullptr) { }
- QQuickPointerEvent *reset(const QQuickPointerDevice* dev, const QMouseEvent *ev) {
- m_device = dev;
- m_event = ev;
- m_button = ev->button();
- m_pressedButtons = ev->buttons();
- Qt::TouchPointState state = Qt::TouchPointStationary;
- switch (ev->type()) {
- case QEvent::MouseButtonPress:
- state = Qt::TouchPointPressed;
- break;
- case QEvent::MouseButtonRelease:
- state = Qt::TouchPointReleased;
- break;
- case QEvent::MouseMove:
- state = Qt::TouchPointMoved;
- break;
- default:
- break;
- }
-
- if (!m_mousePoint)
- m_mousePoint = new QQuickEventPoint;
- m_mousePoint->reset(state, ev->windowPos(), 0); // mouse is 0
- return this;
- }
-
- QQuickPointerEvent *reset(const QQuickPointerDevice* dev, const QTouchEvent *ev) {
- m_device = dev;
- m_event = ev;
- m_button = Qt::NoButton;
- m_pressedButtons = Qt::NoButton;
-
- const QList<QTouchEvent::TouchPoint> &tps = ev->touchPoints();
- const int pointCount = tps.count();
- while (pointCount > m_touchPoints.count())
- m_touchPoints.append(new QQuickEventTouchPoint);
-
- for (int i = 0; i < pointCount; ++i)
- m_touchPoints.at(i)->reset(tps.at(i));
- return this;
- }
+ QQuickPointerEvent *reset(const QQuickPointerDevice* dev, const QMouseEvent *ev);
+ QQuickPointerEvent *reset(const QQuickPointerDevice* dev, const QTouchEvent *ev);
const QQuickPointerDevice *device() const { return m_device; }
Qt::KeyboardModifiers modifiers() const { return m_event ? m_event->modifiers() : Qt::NoModifier; }