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

5 files changed, 26 insertions, 26 deletions

diff --git a/src/corelib/tools/qmargins.h b/src/corelib/tools/qmargins.h
index ba634de..b40380c 100644
--- a/src/corelib/tools/qmargins.h
+++ b/src/corelib/tools/qmargins.h
@@ -87,8 +87,8 @@ Q_DECLARE_TYPEINFO(QMargins, Q_MOVABLE_TYPE);
 inline QMargins::QMargins()
 { m_top = m_bottom = m_left = m_right = 0; }
 
-inline QMargins::QMargins(int left, int top, int right, int bottom)
-{ m_left = left; m_top = top; m_right = right; m_bottom = bottom; }
+inline QMargins::QMargins(int aleft, int atop, int aright, int abottom)
+    : m_left(aleft), m_top(atop), m_right(aright), m_bottom(abottom) {}
 
 inline bool QMargins::isNull() const
 { return m_left==0 && m_top==0 && m_right==0 && m_bottom==0; }
@@ -106,17 +106,17 @@ inline int QMargins::bottom() const
 { return m_bottom; }
 
 
-inline void QMargins::setLeft(int left)
-{ m_left = left; }
+inline void QMargins::setLeft(int aleft)
+{ m_left = aleft; }
 
-inline void QMargins::setTop(int top)
-{ m_top = top; }
+inline void QMargins::setTop(int atop)
+{ m_top = atop; }
 
-inline void QMargins::setRight(int right)
-{ m_right = right; }
+inline void QMargins::setRight(int aright)
+{ m_right = aright; }
 
-inline void QMargins::setBottom(int bottom)
-{ m_bottom = bottom; }
+inline void QMargins::setBottom(int abottom)
+{ m_bottom = abottom; }
 
 inline bool operator==(const QMargins &m1, const QMargins &m2)
 {
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index 2737a87..b77b53a 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -373,9 +373,9 @@ QVector<T> &QVector<T>::operator=(const QVector<T> &v)
 template <typename T>
 inline QVectorData *QVector<T>::malloc(int aalloc)
 {
-    QVectorData *data = static_cast<QVectorData *>(qMalloc(sizeOfTypedData() + (aalloc - 1) * sizeof(T)));
-    Q_CHECK_PTR(data);
-    return data;
+    QVectorData *vectordata = static_cast<QVectorData *>(qMalloc(sizeOfTypedData() + (aalloc - 1) * sizeof(T)));
+    Q_CHECK_PTR(vectordata);
+    return vectordata;
 }
 
 template <typename T>
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h
index 665f33f..089d6fe 100644
--- a/src/gui/graphicsview/qgraphicsitem.h
+++ b/src/gui/graphicsview/qgraphicsitem.h
@@ -294,8 +294,8 @@ public:
 
     QPointF transformOriginPoint() const;
     void setTransformOriginPoint(const QPointF &origin);
-    inline void setTransformOriginPoint(qreal x, qreal y)
-    { setTransformOriginPoint(QPointF(x,y)); }
+    inline void setTransformOriginPoint(qreal ax, qreal ay)
+    { setTransformOriginPoint(QPointF(ax,ay)); }
 
     virtual void advance(int phase);
 
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;
diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h
index 983ebd5..8887f0e 100644
--- a/src/gui/painting/qmatrix.h
+++ b/src/gui/painting/qmatrix.h
@@ -129,13 +129,13 @@ private:
             , _m22(1.)
             , _dx(0.)
             , _dy(0.) {}
-    inline QMatrix(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qreal dy, bool)
-            : _m11(m11)
-            , _m12(m12)
-            , _m21(m21)
-            , _m22(m22)
-            , _dx(dx)
-            , _dy(dy) {}
+    inline QMatrix(qreal am11, qreal am12, qreal am21, qreal am22, qreal adx, qreal ady, bool)
+            : _m11(am11)
+            , _m12(am12)
+            , _m21(am21)
+            , _m22(am22)
+            , _dx(adx)
+            , _dy(ady) {}
     friend class QTransform;
     qreal _m11, _m12;
     qreal _m21, _m22;