Fix compile warnings about shadow

Renamed some function parameters so that they do not trigger shadow
warnings.

Change-Id: Iea6561d26d3f77d075fc7f30b047bfa4d34cb2e7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>

6 files changed, 13 insertions, 13 deletions

diff --git a/src/datavisualization/data/qbardataitem.cpp b/src/datavisualization/data/qbardataitem.cpp
index ad74533b..e7849025 100644
--- a/src/datavisualization/data/qbardataitem.cpp
+++ b/src/datavisualization/data/qbardataitem.cpp
@@ -93,8 +93,8 @@ QBarDataItem &QBarDataItem::operator=(const QBarDataItem &other)
 }
 
 /*!
- * \fn void QBarDataItem::setValue(float value)
- * Sets \a value to this data item.
+ * \fn void QBarDataItem::setValue(float val)
+ * Sets value \a val to this data item.
  */
 
 /*!
diff --git a/src/datavisualization/data/qbardataitem.h b/src/datavisualization/data/qbardataitem.h
index a318bb72..fb3e4fae 100644
--- a/src/datavisualization/data/qbardataitem.h
+++ b/src/datavisualization/data/qbardataitem.h
@@ -36,7 +36,7 @@ public:
 
     QBarDataItem &operator=(const QBarDataItem &other);
 
-    inline void setValue(float value) { m_value = value; }
+    inline void setValue(float val) { m_value = val; }
     inline float value() const { return m_value; }
     inline void setRotation(float angle) { m_angle = angle; }
     inline float rotation() const { return m_angle; }
diff --git a/src/datavisualization/data/qscatterdataitem.cpp b/src/datavisualization/data/qscatterdataitem.cpp
index 86c65785..78ec1edf 100644
--- a/src/datavisualization/data/qscatterdataitem.cpp
+++ b/src/datavisualization/data/qscatterdataitem.cpp
@@ -93,8 +93,8 @@ QScatterDataItem &QScatterDataItem::operator=(const QScatterDataItem &other)
 }
 
 /*!
- * \fn void QScatterDataItem::setPosition(const QVector3D &position)
- * Sets \a position to this data item.
+ * \fn void QScatterDataItem::setPosition(const QVector3D &pos)
+ * Sets position \a pos to this data item.
  */
 
 /*!
@@ -103,9 +103,9 @@ QScatterDataItem &QScatterDataItem::operator=(const QScatterDataItem &other)
  */
 
 /*!
- * \fn void QScatterDataItem::setRotation(const QQuaternion &rotation)
- * Sets \a rotation to this data item.
- * The \a rotation should be a normalized QQuaternion.
+ * \fn void QScatterDataItem::setRotation(const QQuaternion &rot)
+ * Sets rotation \a rot to this data item.
+ * The \a rot should be a normalized QQuaternion.
  * If the series also has rotation, item and series rotations are multiplied together.
  * Defaults to no rotation.
  */
diff --git a/src/datavisualization/data/qscatterdataitem.h b/src/datavisualization/data/qscatterdataitem.h
index 8c154f4b..c2fcc20b 100644
--- a/src/datavisualization/data/qscatterdataitem.h
+++ b/src/datavisualization/data/qscatterdataitem.h
@@ -37,9 +37,9 @@ public:
 
     QScatterDataItem &operator=(const QScatterDataItem &other);
 
-    inline void setPosition(const QVector3D &position) { m_position = position; }
+    inline void setPosition(const QVector3D &pos) { m_position = pos; }
     inline QVector3D position() const { return m_position; }
-    inline void setRotation(const QQuaternion &rotation) { m_rotation = rotation; }
+    inline void setRotation(const QQuaternion &rot) { m_rotation = rot; }
     inline QQuaternion rotation() const { return m_rotation; }
     inline void setX(float value) { m_position.setX(value); }
     inline void setY(float value) { m_position.setY(value); }
diff --git a/src/datavisualization/data/qsurfacedataitem.cpp b/src/datavisualization/data/qsurfacedataitem.cpp
index 3c9171cf..b11d480f 100644
--- a/src/datavisualization/data/qsurfacedataitem.cpp
+++ b/src/datavisualization/data/qsurfacedataitem.cpp
@@ -82,8 +82,8 @@ QSurfaceDataItem &QSurfaceDataItem::operator=(const QSurfaceDataItem &other)
 }
 
 /*!
- * \fn void QSurfaceDataItem::setPosition(const QVector3D &position)
- * Sets \a position to this data item.
+ * \fn void QSurfaceDataItem::setPosition(const QVector3D &pos)
+ * Sets position \a pos to this data item.
  */
 
 /*!
diff --git a/src/datavisualization/data/qsurfacedataitem.h b/src/datavisualization/data/qsurfacedataitem.h
index 33ecc7aa..972d3e17 100644
--- a/src/datavisualization/data/qsurfacedataitem.h
+++ b/src/datavisualization/data/qsurfacedataitem.h
@@ -36,7 +36,7 @@ public:
 
     QSurfaceDataItem &operator=(const QSurfaceDataItem &other);
 
-    inline void setPosition(const QVector3D &position) { m_position = position; }
+    inline void setPosition(const QVector3D &pos) { m_position = pos; }
     inline QVector3D position() const { return m_position; }
     inline void setX(float value) { m_position.setX(value); }
     inline void setY(float value) { m_position.setY(value); }