whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Gunnar Sletta 2011-09-15 08:48:10 +02:00 committed by Qt by Nokia
parent 36ee35406d
commit d75d22d1b2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/kernel/qwindow.h
View File

@ -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;

14
src/testlib/qtesttouch.h
View File

@ -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)