summaryrefslogtreecommitdiffstats
path: root/examples/embedded
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2020-06-04 18:07:06 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2020-06-08 19:11:51 +0200
commita061a646429c6e9d695458fc0ecb0021a30e12ee (patch)
tree7ba6fce7ee7c8975b0c50e31195bd02c5419fc15 /examples/embedded
parent24e52c10deedbaef833c0e2c3ee7bee03eacc4f5 (diff)
Replace calls to deprecated QEvent accessor functions
Many of these were generated by clazy using the new qevent-accessors check. Change-Id: Ie17af17f50fdc9f47d7859d267c14568cc350fd0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'examples/embedded')
-rw-r--r--examples/embedded/flickable/flickable.cpp14
-rw-r--r--examples/embedded/flickable/main.cpp2
-rw-r--r--examples/embedded/lightmaps/lightmaps.cpp10
-rw-r--r--examples/embedded/raycasting/raycasting.cpp8
4 files changed, 17 insertions, 17 deletions
diff --git a/examples/embedded/flickable/flickable.cpp b/examples/embedded/flickable/flickable.cpp
index c57ec3d111..15c1873e53 100644
--- a/examples/embedded/flickable/flickable.cpp
+++ b/examples/embedded/flickable/flickable.cpp
@@ -158,14 +158,14 @@ void Flickable::handleMousePress(QMouseEvent *event)
case FlickablePrivate::Steady:
event->accept();
d->state = FlickablePrivate::Pressed;
- d->pressPos = event->pos();
+ d->pressPos = event->position().toPoint();
break;
case FlickablePrivate::AutoScroll:
event->accept();
d->state = FlickablePrivate::Stop;
d->speed = QPoint(0, 0);
- d->pressPos = event->pos();
+ d->pressPos = event->position().toPoint();
d->offset = scrollOffset();
d->ticker->stop();
break;
@@ -206,14 +206,14 @@ void Flickable::handleMouseRelease(QMouseEvent *event)
case FlickablePrivate::ManualScroll:
event->accept();
- delta = event->pos() - d->pressPos;
+ delta = event->position().toPoint() - d->pressPos;
if (d->timeStamp.elapsed() > 100) {
d->timeStamp.start();
d->speed = delta - d->delta;
d->delta = delta;
}
d->offset = scrollOffset();
- d->pressPos = event->pos();
+ d->pressPos = event->position().toPoint();
if (d->speed == QPoint(0, 0)) {
d->state = FlickablePrivate::Steady;
} else {
@@ -250,20 +250,20 @@ void Flickable::handleMouseMove(QMouseEvent *event)
case FlickablePrivate::Pressed:
case FlickablePrivate::Stop:
- delta = event->pos() - d->pressPos;
+ delta = event->position().toPoint() - d->pressPos;
if (delta.x() > d->threshold || delta.x() < -d->threshold ||
delta.y() > d->threshold || delta.y() < -d->threshold) {
d->timeStamp.start();
d->state = FlickablePrivate::ManualScroll;
d->delta = QPoint(0, 0);
- d->pressPos = event->pos();
+ d->pressPos = event->position().toPoint();
event->accept();
}
break;
case FlickablePrivate::ManualScroll:
event->accept();
- delta = event->pos() - d->pressPos;
+ delta = event->position().toPoint() - d->pressPos;
setScrollOffset(d->offset - delta);
if (d->timeStamp.elapsed() > 100) {
d->timeStamp.start();
diff --git a/examples/embedded/flickable/main.cpp b/examples/embedded/flickable/main.cpp
index 9367c8b4fe..973154331d 100644
--- a/examples/embedded/flickable/main.cpp
+++ b/examples/embedded/flickable/main.cpp
@@ -185,7 +185,7 @@ protected:
return;
if (event->button() == Qt::LeftButton) {
- int y = event->pos().y() + m_offset;
+ int y = event->position().toPoint().y() + m_offset;
int i = y / m_height;
if (i != m_highlight) {
m_highlight = i;
diff --git a/examples/embedded/lightmaps/lightmaps.cpp b/examples/embedded/lightmaps/lightmaps.cpp
index 6334530c3a..8ad3035016 100644
--- a/examples/embedded/lightmaps/lightmaps.cpp
+++ b/examples/embedded/lightmaps/lightmaps.cpp
@@ -209,7 +209,7 @@ void LightMaps::mousePressEvent(QMouseEvent *event)
if (event->buttons() != Qt::LeftButton)
return;
pressed = snapped = true;
- pressPos = dragPos = event->pos();
+ pressPos = dragPos = event->position().toPoint();
tapTimer.stop();
tapTimer.start(HOLD_TIME, this);
}
@@ -220,13 +220,13 @@ void LightMaps::mouseMoveEvent(QMouseEvent *event)
return;
if (!zoomed) {
if (!pressed || !snapped) {
- QPoint delta = event->pos() - pressPos;
- pressPos = event->pos();
+ QPoint delta = event->position().toPoint() - pressPos;
+ pressPos = event->position().toPoint();
m_normalMap->pan(delta);
return;
} else {
const int threshold = 10;
- QPoint delta = event->pos() - pressPos;
+ QPoint delta = event->position().toPoint() - pressPos;
if (snapped) {
snapped &= delta.x() < threshold;
snapped &= delta.y() < threshold;
@@ -237,7 +237,7 @@ void LightMaps::mouseMoveEvent(QMouseEvent *event)
tapTimer.stop();
}
} else {
- dragPos = event->pos();
+ dragPos = event->position().toPoint();
update();
}
}
diff --git a/examples/embedded/raycasting/raycasting.cpp b/examples/embedded/raycasting/raycasting.cpp
index c0a1e48fa6..19e3c8b271 100644
--- a/examples/embedded/raycasting/raycasting.cpp
+++ b/examples/embedded/raycasting/raycasting.cpp
@@ -336,15 +336,15 @@ protected:
}
void mousePressEvent(QMouseEvent *event) {
- qreal dx = centerPad.x() - event->pos().x();
- qreal dy = centerPad.y() - event->pos().y();
+ qreal dx = centerPad.x() - event->position().toPoint().x();
+ qreal dy = centerPad.y() - event->position().toPoint().y();
angleDelta = dx * 2 * M_PI / width();
moveDelta = dy * 10 / height();
}
void mouseMoveEvent(QMouseEvent *event) {
- qreal dx = centerPad.x() - event->pos().x();
- qreal dy = centerPad.y() - event->pos().y();
+ qreal dx = centerPad.x() - event->position().toPoint().x();
+ qreal dy = centerPad.y() - event->position().toPoint().y();
angleDelta = dx * 2 * M_PI / width();
moveDelta = dy * 10 / height();
}