From d75d22d1b29f2d1ec826aebb0e8c0646760dbb10 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Thu, 15 Sep 2011 08:48:10 +0200 Subject: compile when shadowing is an error Change-Id: If12cd19821d07303e808e19be1ee3984c90110b1 Reviewed-on: http://codereview.qt-project.org/4946 Reviewed-by: Qt Sanity Bot Reviewed-by: Lars Knoll --- src/testlib/qtesttouch.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/testlib/qtesttouch.h') diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h index 9191ac96f6..60a300d40a 100644 --- a/src/testlib/qtesttouch.h +++ b/src/testlib/qtesttouch.h @@ -157,15 +157,15 @@ namespace QTest return window->mapToGlobal(pt); return targetWindow ? targetWindow->mapToGlobal(pt) : pt; } - QWindowSystemInterface::TouchPoint touchPoint(const QTouchEvent::TouchPoint& point) + QWindowSystemInterface::TouchPoint touchPoint(const QTouchEvent::TouchPoint& pt) { QWindowSystemInterface::TouchPoint p; - p.id = point.id(); - p.isPrimary = point.isPrimary(); - p.normalPosition = point.screenRect().topLeft(); - p.area = point.screenRect(); - p.pressure = point.pressure(); - p.state = point.state(); + p.id = pt.id(); + p.isPrimary = pt.isPrimary(); + p.normalPosition = pt.screenRect().topLeft(); + p.area = pt.screenRect(); + p.pressure = pt.pressure(); + p.state = pt.state(); return p; } QList touchPointList(const QList& pointList) -- cgit v1.2.3