summaryrefslogtreecommitdiffstats
path: root/examples/embedded/flickable
diff options
context:
space:
mode:
Diffstat (limited to 'examples/embedded/flickable')
-rw-r--r--examples/embedded/flickable/flickable.cpp14
-rw-r--r--examples/embedded/flickable/main.cpp2
2 files changed, 8 insertions, 8 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;