Merge branch 'develop'

Change-Id: I55a342465fa2ddb6db14056f4a991bdc1d4ef8ce

25 files changed, 33 insertions, 33 deletions

diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h
index 37af355f..a02cbdc0 100644
--- a/src/datavisualization/data/abstractitemmodelhandler_p.h
+++ b/src/datavisualization/data/abstractitemmodelhandler_p.h
@@ -46,7 +46,7 @@ public:
     virtual void setItemModel(QAbstractItemModel *itemModel);
     virtual QAbstractItemModel *itemModel() const;
 
-public slots:
+public Q_SLOTS:
     virtual void handleColumnsInserted(const QModelIndex &parent, int start, int end);
     virtual void handleColumnsMoved(const QModelIndex &sourceParent, int sourceStart,
                                     int sourceEnd, const QModelIndex &destinationParent,
@@ -65,7 +65,7 @@ public slots:
     virtual void handleMappingChanged();
     virtual void handlePendingResolve();
 
-signals:
+Q_SIGNALS:
     void itemModelChanged(const QAbstractItemModel *itemModel);
 
 protected:
diff --git a/src/datavisualization/data/baritemmodelhandler_p.h b/src/datavisualization/data/baritemmodelhandler_p.h
index eff04d0d..64c53513 100644
--- a/src/datavisualization/data/baritemmodelhandler_p.h
+++ b/src/datavisualization/data/baritemmodelhandler_p.h
@@ -41,7 +41,7 @@ public:
     BarItemModelHandler(QItemModelBarDataProxy *proxy, QObject *parent = 0);
     virtual ~BarItemModelHandler();
 
-public slots:
+public Q_SLOTS:
     virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
                                    const QVector<int> &roles = QVector<int> ());
 
diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h
index 5c6ec9eb..0b55c97c 100644
--- a/src/datavisualization/data/qabstract3dseries.h
+++ b/src/datavisualization/data/qabstract3dseries.h
@@ -125,7 +125,7 @@ public:
     void setItemLabelVisible(bool visible);
     bool isItemLabelVisible() const;
 
-signals:
+Q_SIGNALS:
     void itemLabelFormatChanged(const QString &format);
     void visibilityChanged(bool visible);
     void meshChanged(QAbstract3DSeries::Mesh mesh);
diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h
index 9a569d28..d098d7cf 100644
--- a/src/datavisualization/data/qbar3dseries.h
+++ b/src/datavisualization/data/qbar3dseries.h
@@ -49,7 +49,7 @@ public:
     void setMeshAngle(float angle);
     float meshAngle() const;
 
-signals:
+Q_SIGNALS:
     void dataProxyChanged(QBarDataProxy *proxy);
     void selectedBarChanged(const QPoint &position);
     void meshAngleChanged(float angle);
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/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index 19a78b45..37240c6d 100644
--- a/src/datavisualization/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -85,7 +85,7 @@ public:
 
     void removeRows(int rowIndex, int removeCount, bool removeLabels = true);
 
-signals:
+Q_SIGNALS:
     void arrayReset();
     void rowsAdded(int startIndex, int count);
     void rowsChanged(int startIndex, int count);
diff --git a/src/datavisualization/data/qcustom3ditem.h b/src/datavisualization/data/qcustom3ditem.h
index 83737677..0995c217 100644
--- a/src/datavisualization/data/qcustom3ditem.h
+++ b/src/datavisualization/data/qcustom3ditem.h
@@ -79,7 +79,7 @@ public:
 
     void setTextureImage(const QImage &textureImage);
 
-signals:
+Q_SIGNALS:
     void meshFileChanged(const QString &meshFile);
     void textureFileChanged(const QString &textureFile);
     void positionChanged(const QVector3D &position);
diff --git a/src/datavisualization/data/qcustom3ditem_p.h b/src/datavisualization/data/qcustom3ditem_p.h
index c83f5169..4b3e7074 100644
--- a/src/datavisualization/data/qcustom3ditem_p.h
+++ b/src/datavisualization/data/qcustom3ditem_p.h
@@ -86,7 +86,7 @@ public:
 
     QCustomItemDirtyBitField m_dirtyBits;
 
-signals:
+Q_SIGNALS:
     void needUpdate();
 
 private:
diff --git a/src/datavisualization/data/qcustom3dlabel.h b/src/datavisualization/data/qcustom3dlabel.h
index 49f68d16..df50f63a 100644
--- a/src/datavisualization/data/qcustom3dlabel.h
+++ b/src/datavisualization/data/qcustom3dlabel.h
@@ -69,7 +69,7 @@ public:
     void setFacingCamera(bool enabled);
     bool isFacingCamera() const;
 
-signals:
+Q_SIGNALS:
     void textChanged(const QString &text);
     void fontChanged(const QFont &font);
     void textColorChanged(const QColor &color);
diff --git a/src/datavisualization/data/qcustom3dvolume.h b/src/datavisualization/data/qcustom3dvolume.h
index d9b082b6..4ee79518 100644
--- a/src/datavisualization/data/qcustom3dvolume.h
+++ b/src/datavisualization/data/qcustom3dvolume.h
@@ -112,7 +112,7 @@ public:
 
     QImage renderSlice(Qt::Axis axis, int index);
 
-signals:
+Q_SIGNALS:
     void textureWidthChanged(int value);
     void textureHeightChanged(int value);
     void textureDepthChanged(int value);
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h
index 09937771..e014fbc9 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h
@@ -59,7 +59,7 @@ public:
     void setMaxZValue(float max);
     float maxZValue() const;
 
-signals:
+Q_SIGNALS:
     void heightMapChanged(const QImage &image);
     void heightMapFileChanged(const QString &filename);
     void minXValueChanged(float value);
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h
index 21cffd81..71546d94 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy.h
@@ -132,7 +132,7 @@ public:
     void setMultiMatchBehavior(MultiMatchBehavior behavior);
     MultiMatchBehavior multiMatchBehavior() const;
 
-signals:
+Q_SIGNALS:
     void itemModelChanged(const QAbstractItemModel* itemModel);
     void rowRoleChanged(const QString &role);
     void columnRoleChanged(const QString &role);
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index a1704037..ae1413c5 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h
@@ -90,7 +90,7 @@ public:
     void setRotationRoleReplace(const QString &replace);
     QString rotationRoleReplace() const;
 
-signals:
+Q_SIGNALS:
     void itemModelChanged(const QAbstractItemModel* itemModel);
     void xPosRoleChanged(const QString &role);
     void yPosRoleChanged(const QString &role);
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
index 88478755..08ce94aa 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
@@ -146,7 +146,7 @@ public:
     void setMultiMatchBehavior(MultiMatchBehavior behavior);
     MultiMatchBehavior multiMatchBehavior() const;
 
-signals:
+Q_SIGNALS:
     void itemModelChanged(const QAbstractItemModel* itemModel);
     void rowRoleChanged(const QString &role);
     void columnRoleChanged(const QString &role);
diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h
index 5556b566..ebc42cc6 100644
--- a/src/datavisualization/data/qscatter3dseries.h
+++ b/src/datavisualization/data/qscatter3dseries.h
@@ -48,7 +48,7 @@ public:
     void setItemSize(float size);
     float itemSize() const;
 
-signals:
+Q_SIGNALS:
     void dataProxyChanged(QScatterDataProxy *proxy);
     void selectedItemChanged(int index);
     void itemSizeChanged(float size);
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/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h
index 8e562fd4..fffac6d4 100644
--- a/src/datavisualization/data/qscatterdataproxy.h
+++ b/src/datavisualization/data/qscatterdataproxy.h
@@ -61,7 +61,7 @@ public:
 
     void removeItems(int index, int removeCount);
 
-signals:
+Q_SIGNALS:
     void arrayReset();
     void itemsAdded(int startIndex, int count);
     void itemsChanged(int startIndex, int count);
diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index a5215175..693681da 100644
--- a/src/datavisualization/data/qsurface3dseries.h
+++ b/src/datavisualization/data/qsurface3dseries.h
@@ -70,7 +70,7 @@ public:
     void setTextureFile(const QString &filename);
     QString textureFile() const;
 
-signals:
+Q_SIGNALS:
     void dataProxyChanged(QSurfaceDataProxy *proxy);
     void selectedPointChanged(const QPoint &position);
     void flatShadingEnabledChanged(bool enable);
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); }
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index 8bb6e42e..0101955e 100644
--- a/src/datavisualization/data/qsurfacedataproxy.h
+++ b/src/datavisualization/data/qsurfacedataproxy.h
@@ -68,7 +68,7 @@ public:
 
     void removeRows(int rowIndex, int removeCount);
 
-signals:
+Q_SIGNALS:
     void arrayReset();
     void rowsAdded(int startIndex, int count);
     void rowsChanged(int startIndex, int count);
diff --git a/src/datavisualization/data/scatteritemmodelhandler_p.h b/src/datavisualization/data/scatteritemmodelhandler_p.h
index b5461b38..688ce34b 100644
--- a/src/datavisualization/data/scatteritemmodelhandler_p.h
+++ b/src/datavisualization/data/scatteritemmodelhandler_p.h
@@ -41,7 +41,7 @@ public:
     ScatterItemModelHandler(QItemModelScatterDataProxy *proxy, QObject *parent = 0);
     virtual ~ScatterItemModelHandler();
 
-public slots:
+public Q_SLOTS:
     virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
                                    const QVector<int> &roles = QVector<int> ());
     virtual void handleRowsInserted(const QModelIndex &parent, int start, int end);
diff --git a/src/datavisualization/data/surfaceitemmodelhandler_p.h b/src/datavisualization/data/surfaceitemmodelhandler_p.h
index 7cfdba99..6273e9c9 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler_p.h
+++ b/src/datavisualization/data/surfaceitemmodelhandler_p.h
@@ -41,7 +41,7 @@ public:
     SurfaceItemModelHandler(QItemModelSurfaceDataProxy *proxy, QObject *parent = 0);
     virtual ~SurfaceItemModelHandler();
 
-public slots:
+public Q_SLOTS:
     virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
                                    const QVector<int> &roles = QVector<int> ());