Merge branch 'develop'

Change-Id: I55a342465fa2ddb6db14056f4a991bdc1d4ef8ce

1 files changed, 2 insertions, 2 deletions

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); }