diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-15 08:48:10 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-15 09:17:05 +0200 |
commit | d75d22d1b29f2d1ec826aebb0e8c0646760dbb10 (patch) | |
tree | cd3c323002f2f9648885c849287acc58cdf0686a /src/gui | |
parent | 36ee35406d9fa63fcdf3810466f106a524c16e6f (diff) |
compile when shadowing is an error
Change-Id: If12cd19821d07303e808e19be1ee3984c90110b1
Reviewed-on: http://codereview.qt-project.org/4946
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/kernel/qwindow.h | 6 |
1 files changed, 3 insertions, 3 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; |