diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-22 08:35:08 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-22 09:18:43 (GMT) |
commit | b7647b38103676c68ad603d1391e62c5d01dc3b2 (patch) | |
tree | 1cfd3d9e9458965763b64a3b5e49454cba423c73 /src/gui/kernel | |
parent | 66c8ec60ff44fa8f2fb0d3994ffccf4b033fdb70 (diff) | |
download | Qt-b7647b38103676c68ad603d1391e62c5d01dc3b2.zip Qt-b7647b38103676c68ad603d1391e62c5d01dc3b2.tar.gz Qt-b7647b38103676c68ad603d1391e62c5d01dc3b2.tar.bz2 |
Fixes some warning in headers
such as
margins.h:90: warning: declaration of ???bottom??? shadows a member of _this_"
'a' stands for argument
Reviewed-by: jbache
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qevent.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 697b93a..fa2b22f 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -70,7 +70,7 @@ public: QInputEvent(Type type, Qt::KeyboardModifiers modifiers = Qt::NoModifier); ~QInputEvent(); inline Qt::KeyboardModifiers modifiers() const { return modState; } - inline void setModifiers(Qt::KeyboardModifiers modifiers) { modState = modifiers; } + inline void setModifiers(Qt::KeyboardModifiers amodifiers) { modState = amodifiers; } protected: Qt::KeyboardModifiers modState; }; @@ -805,10 +805,10 @@ public: inline const QList<QTouchEvent::TouchPoint> &touchPoints() const { return _touchPoints; } // internal - inline void setWidget(QWidget *widget) { _widget = widget; } - inline void setDeviceType(DeviceType deviceType) { _deviceType = deviceType; } + inline void setWidget(QWidget *awidget) { _widget = awidget; } + inline void setDeviceType(DeviceType adeviceType) { _deviceType = adeviceType; } inline void setTouchPointStates(Qt::TouchPointStates touchPointStates) { _touchPointStates = touchPointStates; } - inline void setTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints) { _touchPoints = touchPoints; } + inline void setTouchPoints(const QList<QTouchEvent::TouchPoint> &atouchPoints) { _touchPoints = atouchPoints; } protected: QWidget *_widget; |