aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickmultipointtoucharea_p.h
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2020-07-13 13:40:04 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2020-07-15 20:52:59 +0200
commitc0e72e34863a5628c51e5c3bb42bcc455c310340 (patch)
tree71e661d2c54258a756087627227f4feb39521bae /src/quick/items/qquickmultipointtoucharea_p.h
parent151f58dc29f4b53fb46a96d773aee8641593e5c7 (diff)
Replace QTouchEvent::TouchPoint with QEventPoint
It's a cosmetic change at this time, because we have declared using TouchPoint = QEventPoint; Also replace Qt::TouchPointState enum with QEventPoint::State. Task-number: QTBUG-72173 Change-Id: Ife017aa98801c28abc6cccd106f47a95421549de Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/quick/items/qquickmultipointtoucharea_p.h')
-rw-r--r--src/quick/items/qquickmultipointtoucharea_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h
index 1df4912585..693ceea50c 100644
--- a/src/quick/items/qquickmultipointtoucharea_p.h
+++ b/src/quick/items/qquickmultipointtoucharea_p.h
@@ -271,11 +271,11 @@ protected:
void touchUngrabEvent() override;
void addTouchPrototype(QQuickTouchPoint* prototype);
- void addTouchPoint(const QTouchEvent::TouchPoint *p);
+ void addTouchPoint(const QEventPoint *p);
void addTouchPoint(const QMouseEvent *e);
void clearTouchLists();
- void updateTouchPoint(QQuickTouchPoint*, const QTouchEvent::TouchPoint*);
+ void updateTouchPoint(QQuickTouchPoint*, const QEventPoint*);
void updateTouchPoint(QQuickTouchPoint *dtp, const QMouseEvent *e);
void updateTouchData(QEvent*);
@@ -300,7 +300,7 @@ private:
int _maximumTouchPoints;
QVector<int> _lastFilterableTouchPointIds;
QPointer<QQuickTouchPoint> _mouseTouchPoint; // exists when mouse button is down and _mouseEnabled is true; null otherwise
- QTouchEvent::TouchPoint _mouseQpaTouchPoint; // synthetic QPA touch point to hold state and position of the mouse
+ QEventPoint _mouseQpaTouchPoint; // synthetic QPA touch point to hold state and position of the mouse
const QPointingDevice *_touchMouseDevice;
QPointF _mousePos;
bool _stealMouse;