summaryrefslogtreecommitdiffstats
path: root/examples/opengl
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/opengl
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/opengl')
-rw-r--r--examples/opengl/cube/mainwidget.cpp4
-rw-r--r--examples/opengl/hellogl2/glwidget.cpp8
-rw-r--r--examples/opengl/textures/glwidget.cpp8
3 files changed, 10 insertions, 10 deletions
diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp
index 558ecd1299..0b44ecfcea 100644
--- a/examples/opengl/cube/mainwidget.cpp
+++ b/examples/opengl/cube/mainwidget.cpp
@@ -68,13 +68,13 @@ MainWidget::~MainWidget()
void MainWidget::mousePressEvent(QMouseEvent *e)
{
// Save mouse press position
- mousePressPosition = QVector2D(e->localPos());
+ mousePressPosition = QVector2D(e->position());
}
void MainWidget::mouseReleaseEvent(QMouseEvent *e)
{
// Mouse release position - mouse press position
- QVector2D diff = QVector2D(e->localPos()) - mousePressPosition;
+ QVector2D diff = QVector2D(e->position()) - mousePressPosition;
// Rotation axis is perpendicular to the mouse position difference
// vector
diff --git a/examples/opengl/hellogl2/glwidget.cpp b/examples/opengl/hellogl2/glwidget.cpp
index 543e70f8ac..9988902071 100644
--- a/examples/opengl/hellogl2/glwidget.cpp
+++ b/examples/opengl/hellogl2/glwidget.cpp
@@ -284,13 +284,13 @@ void GLWidget::resizeGL(int w, int h)
void GLWidget::mousePressEvent(QMouseEvent *event)
{
- m_lastPos = event->pos();
+ m_lastPos = event->position().toPoint();
}
void GLWidget::mouseMoveEvent(QMouseEvent *event)
{
- int dx = event->x() - m_lastPos.x();
- int dy = event->y() - m_lastPos.y();
+ int dx = event->position().toPoint().x() - m_lastPos.x();
+ int dy = event->position().toPoint().y() - m_lastPos.y();
if (event->buttons() & Qt::LeftButton) {
setXRotation(m_xRot + 8 * dy);
@@ -299,5 +299,5 @@ void GLWidget::mouseMoveEvent(QMouseEvent *event)
setXRotation(m_xRot + 8 * dy);
setZRotation(m_zRot + 8 * dx);
}
- m_lastPos = event->pos();
+ m_lastPos = event->position().toPoint();
}
diff --git a/examples/opengl/textures/glwidget.cpp b/examples/opengl/textures/glwidget.cpp
index 307190f308..be5a46e532 100644
--- a/examples/opengl/textures/glwidget.cpp
+++ b/examples/opengl/textures/glwidget.cpp
@@ -164,20 +164,20 @@ void GLWidget::resizeGL(int width, int height)
void GLWidget::mousePressEvent(QMouseEvent *event)
{
- lastPos = event->pos();
+ lastPos = event->position().toPoint();
}
void GLWidget::mouseMoveEvent(QMouseEvent *event)
{
- int dx = event->x() - lastPos.x();
- int dy = event->y() - lastPos.y();
+ int dx = event->position().toPoint().x() - lastPos.x();
+ int dy = event->position().toPoint().y() - lastPos.y();
if (event->buttons() & Qt::LeftButton) {
rotateBy(8 * dy, 8 * dx, 0);
} else if (event->buttons() & Qt::RightButton) {
rotateBy(8 * dy, 0, 8 * dx);
}
- lastPos = event->pos();
+ lastPos = event->position().toPoint();
}
void GLWidget::mouseReleaseEvent(QMouseEvent * /* event */)