diff options
| -rw-r--r-- | src/gui/kernel/qwindow.h | 6 | ||||
| -rw-r--r-- | src/testlib/qtesttouch.h | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 41b63fb54b..53d78c426c 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -136,7 +136,7 @@ public: void setBaseSize(const QSize &size); void setSizeIncrement(const QSize &size); - void setGeometry(int x, int y, int w, int h) { setGeometry(QRect(x, y, w, h)); } + void setGeometry(int posx, int posy, int w, int h) { setGeometry(QRect(posx, posy, w, h)); } void setGeometry(const QRect &rect); QRect geometry() const; @@ -149,9 +149,9 @@ public: inline QPoint pos() const { return geometry().topLeft(); } inline void move(const QPoint &pt) { setGeometry(QRect(pt, size())); } - inline void move(int x, int y) { move(QPoint(x, y)); } + inline void move(int posx, int posy) { move(QPoint(posx, posy)); } - inline void resize(const QSize &size) { setGeometry(QRect(pos(), size)); } + inline void resize(const QSize &newsize) { setGeometry(QRect(pos(), newsize)); } inline void resize(int w, int h) { setGeometry(QRect(x(), y(), w, h)); } QMargins frameMargins() const; 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<struct QWindowSystemInterface::TouchPoint> touchPointList(const QList<QTouchEvent::TouchPoint>& pointList) |