Clean up public API and includes usage

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

31 files changed, 106 insertions, 95 deletions

diff --git a/src/datavisualization/data/abstractitemmodelhandler.cpp b/src/datavisualization/data/abstractitemmodelhandler.cpp
index 63eb7e45..9f2ccd86 100644
--- a/src/datavisualization/data/abstractitemmodelhandler.cpp
+++ b/src/datavisualization/data/abstractitemmodelhandler.cpp
@@ -17,7 +17,6 @@
 ****************************************************************************/
 
 #include "abstractitemmodelhandler_p.h"
-#include <QTimer>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h
index c238a63b..ecbfe61c 100644
--- a/src/datavisualization/data/abstractitemmodelhandler_p.h
+++ b/src/datavisualization/data/abstractitemmodelhandler_p.h
@@ -30,9 +30,9 @@
 #define ABSTRACTITEMMODELHANDLER_P_H
 
 #include "datavisualizationglobal_p.h"
-#include <QAbstractItemModel>
-#include <QPointer>
-#include <QTimer>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QPointer>
+#include <QtCore/QTimer>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/data/abstractrenderitem_p.h b/src/datavisualization/data/abstractrenderitem_p.h
index 8d2fab8a..a53b8e41 100644
--- a/src/datavisualization/data/abstractrenderitem_p.h
+++ b/src/datavisualization/data/abstractrenderitem_p.h
@@ -32,10 +32,10 @@
 #include "datavisualizationglobal_p.h"
 #include "labelitem_p.h"
 
-#include <QOpenGLFunctions>
-#include <QString>
-#include <QVector3D>
-#include <QQuaternion>
+#include <QtCore/QString>
+#include <QtGui/QOpenGLFunctions>
+#include <QtGui/QVector3D>
+#include <QtGui/QQuaternion>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/data/labelitem_p.h b/src/datavisualization/data/labelitem_p.h
index ca60f742..3a2c1eb1 100644
--- a/src/datavisualization/data/labelitem_p.h
+++ b/src/datavisualization/data/labelitem_p.h
@@ -30,8 +30,8 @@
 #define LABELITEM_P_H
 
 #include "datavisualizationglobal_p.h"
-#include <QOpenGLFunctions>
-#include <QSize>
+#include <QtGui/QOpenGLFunctions>
+#include <QtCore/QSize>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h
index a8cee7c9..9f82901d 100644
--- a/src/datavisualization/data/qabstract3dseries.h
+++ b/src/datavisualization/data/qabstract3dseries.h
@@ -20,10 +20,11 @@
 #define QABSTRACT3DSERIES_H
 
 #include <QtDataVisualization/q3dtheme.h>
-#include <QObject>
-#include <QScopedPointer>
-#include <QLinearGradient>
-#include <QQuaternion>
+#include <QtCore/QObject>
+#include <QtCore/QScopedPointer>
+#include <QtCore/QString>
+#include <QtGui/QLinearGradient>
+#include <QtGui/QQuaternion>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -119,20 +120,20 @@ public:
     QString name() const;
 
 signals:
-    void itemLabelFormatChanged(QString format);
+    void itemLabelFormatChanged(const QString &format);
     void visibilityChanged(bool visible);
     void meshChanged(Mesh mesh);
     void meshSmoothChanged(bool enabled);
-    void meshRotationChanged(QQuaternion rotation);
-    void userDefinedMeshChanged(QString fileName);
+    void meshRotationChanged(const QQuaternion &rotation);
+    void userDefinedMeshChanged(const QString &fileName);
     void colorStyleChanged(Q3DTheme::ColorStyle style);
-    void baseColorChanged(QColor color);
-    void baseGradientChanged(QLinearGradient gradient);
-    void singleHighlightColorChanged(QColor color);
-    void singleHighlightGradientChanged(QLinearGradient gradient);
-    void multiHighlightColorChanged(QColor color);
-    void multiHighlightGradientChanged(QLinearGradient gradient);
-    void nameChanged(QString name);
+    void baseColorChanged(const QColor &color);
+    void baseGradientChanged(const QLinearGradient &gradient);
+    void singleHighlightColorChanged(const QColor &color);
+    void singleHighlightGradientChanged(const QLinearGradient &gradient);
+    void multiHighlightColorChanged(const QColor &color);
+    void multiHighlightGradientChanged(const QLinearGradient &gradient);
+    void nameChanged(const QString &name);
 
 protected:
     QScopedPointer<QAbstract3DSeriesPrivate> d_ptr;
diff --git a/src/datavisualization/data/qabstract3dseries_p.h b/src/datavisualization/data/qabstract3dseries_p.h
index 6fbabd3d..a803e99b 100644
--- a/src/datavisualization/data/qabstract3dseries_p.h
+++ b/src/datavisualization/data/qabstract3dseries_p.h
@@ -28,7 +28,6 @@
 
 #include "datavisualizationglobal_p.h"
 #include "qabstract3dseries.h"
-#include <QString>
 
 #ifndef QABSTRACT3DSERIES_P_H
 #define QABSTRACT3DSERIES_P_H
diff --git a/src/datavisualization/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h
index 52c2e2c6..c643c675 100644
--- a/src/datavisualization/data/qabstractdataproxy.h
+++ b/src/datavisualization/data/qabstractdataproxy.h
@@ -20,9 +20,8 @@
 #define QABSTRACTDATAPROXY_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
-
-#include <QObject>
-#include <QScopedPointer>
+#include <QtCore/QObject>
+#include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/data/qabstractdataproxy_p.h b/src/datavisualization/data/qabstractdataproxy_p.h
index 093629d5..eb901f4c 100644
--- a/src/datavisualization/data/qabstractdataproxy_p.h
+++ b/src/datavisualization/data/qabstractdataproxy_p.h
@@ -28,7 +28,6 @@
 
 #include "datavisualizationglobal_p.h"
 #include "qabstractdataproxy.h"
-#include <QString>
 
 #ifndef QABSTRACTDATAPROXY_P_H
 #define QABSTRACTDATAPROXY_P_H
diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp
index f4b990e9..ed4ffaba 100644
--- a/src/datavisualization/data/qbar3dseries.cpp
+++ b/src/datavisualization/data/qbar3dseries.cpp
@@ -147,15 +147,6 @@ QBar3DSeries::QBar3DSeries(QBarDataProxy *dataProxy, QObject *parent) :
 }
 
 /*!
- * \internal
- */
-QBar3DSeries::QBar3DSeries(QBar3DSeriesPrivate *d, QObject *parent) :
-    QAbstract3DSeries(d, parent)
-{
-    dptr()->connectSignals();
-}
-
-/*!
  * Destroys QBar3DSeries.
  */
 QBar3DSeries::~QBar3DSeries()
diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h
index aa67dadb..c56bc354 100644
--- a/src/datavisualization/data/qbar3dseries.h
+++ b/src/datavisualization/data/qbar3dseries.h
@@ -21,7 +21,7 @@
 
 #include <QtDataVisualization/qabstract3dseries.h>
 #include <QtDataVisualization/qbardataproxy.h>
-#include <QPoint>
+#include <QtCore/QPoint>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -51,11 +51,10 @@ public:
 
 signals:
     void dataProxyChanged(QBarDataProxy *proxy);
-    void selectedBarChanged(QPoint position);
+    void selectedBarChanged(const QPoint &position);
     void meshAngleChanged(float angle);
 
 protected:
-    explicit QBar3DSeries(QBar3DSeriesPrivate *d, QObject *parent = 0);
     QBar3DSeriesPrivate *dptr();
     const QBar3DSeriesPrivate *dptrc() const;
 
diff --git a/src/datavisualization/data/qbardataitem.h b/src/datavisualization/data/qbardataitem.h
index 84e7cd92..e7fce93b 100644
--- a/src/datavisualization/data/qbardataitem.h
+++ b/src/datavisualization/data/qbardataitem.h
@@ -42,7 +42,7 @@ public:
     inline float rotation() const { return m_angle; }
 
 protected:
-    virtual void createExtraData();
+    void createExtraData();
 
     QBarDataItemPrivate *d_ptr;
 
diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp
index 4247e963..d2553f32 100644
--- a/src/datavisualization/data/qbardataproxy.cpp
+++ b/src/datavisualization/data/qbardataproxy.cpp
@@ -130,7 +130,7 @@ QBarDataProxy::~QBarDataProxy()
  *
  *  The series this proxy is attached to.
  */
-QBar3DSeries *QBarDataProxy::series()
+QBar3DSeries *QBarDataProxy::series() const
 {
     return static_cast<QBar3DSeries *>(d_ptr->series());
 }
@@ -227,6 +227,15 @@ void QBarDataProxy::setItem(int rowIndex, int columnIndex, const QBarDataItem &i
 }
 
 /*!
+ * Changes a single item at \a position to the \a item.
+ * The X-value of \a position indicates the row and the Y-value indicates the column.
+ */
+void QBarDataProxy::setItem(const QPoint &position, const QBarDataItem &item)
+{
+    setItem(position.x(), position.y(), item);
+}
+
+/*!
  * Adds a new \a row to the end of array.
  * Existing row labels are not affected.
  *
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index 780897e8..55c11de3 100644
--- a/src/datavisualization/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -21,8 +21,8 @@
 
 #include <QtDataVisualization/qabstractdataproxy.h>
 #include <QtDataVisualization/qbardataitem.h>
-#include <QVector>
-#include <QStringList>
+#include <QtCore/QVector>
+#include <QtCore/QStringList>
 
 namespace QtDataVisualization {
 // typedefs introduced this way because QDoc doesn't understand namespace macros
@@ -47,7 +47,7 @@ public:
     explicit QBarDataProxy(QObject *parent = 0);
     virtual ~QBarDataProxy();
 
-    QBar3DSeries *series();
+    QBar3DSeries *series() const;
     int rowCount() const;
 
     QStringList rowLabels() const;
@@ -71,6 +71,7 @@ public:
     void setRows(int rowIndex, const QBarDataArray &rows, const QStringList &labels);
 
     void setItem(int rowIndex, int columnIndex, const QBarDataItem &item);
+    void setItem(const QPoint &position, const QBarDataItem &item);
 
     int addRow(QBarDataRow *row);
     int addRow(QBarDataRow *row, const QString &label);
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
index 9ac5c90f..1aead1d7 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
@@ -134,6 +134,18 @@ QHeightMapSurfaceDataProxy::QHeightMapSurfaceDataProxy(const QImage &image, QObj
 }
 
 /*!
+ * Constructs QHeightMapSurfaceDataProxy from the given image \a filename and \a parent. Height map is set
+ * by calling setHeightMapFile() with \a filename.
+ *
+ * \sa heightMapFile
+ */
+QHeightMapSurfaceDataProxy::QHeightMapSurfaceDataProxy(const QString &filename, QObject *parent) :
+    QSurfaceDataProxy(new QHeightMapSurfaceDataProxyPrivate(this), parent)
+{
+    setHeightMapFile(filename);
+}
+
+/*!
  * \internal
  */
 QHeightMapSurfaceDataProxy::QHeightMapSurfaceDataProxy(
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h
index d506d4e8..5b6eb284 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h
@@ -20,8 +20,8 @@
 #define QHEIGHTMAPSURFACEDATAPROXY_H
 
 #include <QtDataVisualization/qsurfacedataproxy.h>
-
-#include <QImage>
+#include <QtGui/QImage>
+#include <QtCore/QString>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -41,6 +41,7 @@ class QT_DATAVISUALIZATION_EXPORT QHeightMapSurfaceDataProxy : public QSurfaceDa
 public:
     explicit QHeightMapSurfaceDataProxy(QObject *parent = 0);
     explicit QHeightMapSurfaceDataProxy(const QImage &image, QObject *parent = 0);
+    explicit QHeightMapSurfaceDataProxy(const QString &filename, QObject *parent = 0);
     virtual ~QHeightMapSurfaceDataProxy();
 
     void setHeightMap(const QImage &image);
@@ -59,8 +60,8 @@ public:
     float maxZValue() const;
 
 signals:
-    void heightMapChanged(QImage image);
-    void heightMapFileChanged(QString filename);
+    void heightMapChanged(const QImage &image);
+    void heightMapFileChanged(const QString &filename);
     void minXValueChanged(float value);
     void maxXValueChanged(float value);
     void minZValueChanged(float value);
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
index 0e947666..5cc9993a 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
@@ -31,7 +31,7 @@
 
 #include "qheightmapsurfacedataproxy.h"
 #include "qsurfacedataproxy_p.h"
-#include <QTimer>
+#include <QtCore/QTimer>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp
index 6612a387..0e880c77 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp
@@ -18,7 +18,6 @@
 
 #include "qitemmodelbardataproxy_p.h"
 #include "baritemmodelhandler_p.h"
-#include <QTimer>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -379,7 +378,7 @@ void QItemModelBarDataProxy::setRowCategories(const QStringList &categories)
 {
     if (dptr()->m_rowCategories != categories) {
         dptr()->m_rowCategories = categories;
-        emit rowCategoriesChanged(categories);
+        emit rowCategoriesChanged();
     }
 }
 
@@ -397,7 +396,7 @@ void QItemModelBarDataProxy::setColumnCategories(const QStringList &categories)
 {
     if (dptr()->m_columnCategories != categories) {
         dptr()->m_columnCategories = categories;
-        emit columnCategoriesChanged(categories);
+        emit columnCategoriesChanged();
     }
 }
 
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h
index ce3ccaa3..f19b4445 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy.h
@@ -20,8 +20,7 @@
 #define QITEMMODELBARDATAPROXY_H
 
 #include <QtDataVisualization/qbardataproxy.h>
-#include <QAbstractItemModel>
-#include <QStringList>
+#include <QtCore/QAbstractItemModel>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -96,12 +95,12 @@ public:
 
 signals:
     void itemModelChanged(const QAbstractItemModel* itemModel);
-    void rowRoleChanged(QString role);
-    void columnRoleChanged(QString role);
-    void valueRoleChanged(QString role);
-    void rotationRoleChanged(QString role);
-    void rowCategoriesChanged(QStringList categories);
-    void columnCategoriesChanged(QStringList categories);
+    void rowRoleChanged(const QString &role);
+    void columnRoleChanged(const QString &role);
+    void valueRoleChanged(const QString &role);
+    void rotationRoleChanged(const QString &role);
+    void rowCategoriesChanged();
+    void columnCategoriesChanged();
     void useModelCategoriesChanged(bool enable);
     void autoRowCategoriesChanged(bool enable);
     void autoColumnCategoriesChanged(bool enable);
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
index 4f407075..a5287abc 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
@@ -18,7 +18,6 @@
 
 #include "qitemmodelscatterdataproxy_p.h"
 #include "scatteritemmodelhandler_p.h"
-#include <QTimer>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index ef950843..c6d2245d 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h
@@ -20,8 +20,8 @@
 #define QITEMMODELSCATTERDATAPROXY_H
 
 #include <QtDataVisualization/qscatterdataproxy.h>
-#include <QAbstractItemModel>
-#include <QStringList>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QString>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -65,10 +65,10 @@ public:
 
 signals:
     void itemModelChanged(const QAbstractItemModel* itemModel);
-    void xPosRoleChanged(QString role);
-    void yPosRoleChanged(QString role);
-    void zPosRoleChanged(QString role);
-    void rotationRoleChanged(QString role);
+    void xPosRoleChanged(const QString &role);
+    void yPosRoleChanged(const QString &role);
+    void zPosRoleChanged(const QString &role);
+    void rotationRoleChanged(const QString &role);
 
 protected:
     QItemModelScatterDataProxyPrivate *dptr();
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
index 49c4d4ef..f15a8923 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
@@ -18,7 +18,6 @@
 
 #include "qitemmodelsurfacedataproxy_p.h"
 #include "surfaceitemmodelhandler_p.h"
-#include <QTimer>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -426,7 +425,7 @@ void QItemModelSurfaceDataProxy::setRowCategories(const QStringList &categories)
 {
     if (dptr()->m_rowCategories != categories) {
         dptr()->m_rowCategories = categories;
-        emit rowCategoriesChanged(categories);
+        emit rowCategoriesChanged();
     }
 }
 
@@ -444,7 +443,7 @@ void QItemModelSurfaceDataProxy::setColumnCategories(const QStringList &categori
 {
     if (dptr()->m_columnCategories != categories) {
         dptr()->m_columnCategories = categories;
-        emit columnCategoriesChanged(categories);
+        emit columnCategoriesChanged();
     }
 }
 
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
index a905f4c7..b1ebbeed 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
@@ -20,8 +20,8 @@
 #define QITEMMODELSURFACEDATAPROXY_H
 
 #include <QtDataVisualization/qsurfacedataproxy.h>
-#include <QAbstractItemModel>
-#include <QStringList>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -101,13 +101,13 @@ public:
 
 signals:
     void itemModelChanged(const QAbstractItemModel* itemModel);
-    void rowRoleChanged(QString role);
-    void columnRoleChanged(QString role);
-    void xPosRoleChanged(QString role);
-    void yPosRoleChanged(QString role);
-    void zPosRoleChanged(QString role);
-    void rowCategoriesChanged(QStringList categories);
-    void columnCategoriesChanged(QStringList categories);
+    void rowRoleChanged(const QString &role);
+    void columnRoleChanged(const QString &role);
+    void xPosRoleChanged(const QString &role);
+    void yPosRoleChanged(const QString &role);
+    void zPosRoleChanged(const QString &role);
+    void rowCategoriesChanged();
+    void columnCategoriesChanged();
     void useModelCategoriesChanged(bool enable);
     void autoRowCategoriesChanged(bool enable);
     void autoColumnCategoriesChanged(bool enable);
diff --git a/src/datavisualization/data/qscatterdataitem.h b/src/datavisualization/data/qscatterdataitem.h
index 62ebac56..87cc1fc5 100644
--- a/src/datavisualization/data/qscatterdataitem.h
+++ b/src/datavisualization/data/qscatterdataitem.h
@@ -20,8 +20,7 @@
 #define QSCATTERDATAITEM_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
-
-#include <QQuaternion>
+#include <QtGui/QQuaternion>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -50,7 +49,7 @@ public:
     inline float z() const { return m_position.z(); }
 
 protected:
-    virtual void createExtraData();
+    void createExtraData();
 
     QScatterDataItemPrivate *d_ptr;
 
diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp
index b5e3863d..dbbb4384 100644
--- a/src/datavisualization/data/qscatterdataproxy.cpp
+++ b/src/datavisualization/data/qscatterdataproxy.cpp
@@ -98,7 +98,7 @@ QScatterDataProxy::~QScatterDataProxy()
  *
  *  The series this proxy is attached to.
  */
-QScatter3DSeries *QScatterDataProxy::series()
+QScatter3DSeries *QScatterDataProxy::series() const
 {
     return static_cast<QScatter3DSeries *>(d_ptr->series());
 }
diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h
index b8179166..fe561bbd 100644
--- a/src/datavisualization/data/qscatterdataproxy.h
+++ b/src/datavisualization/data/qscatterdataproxy.h
@@ -43,7 +43,7 @@ public:
     explicit QScatterDataProxy(QObject *parent = 0);
     virtual ~QScatterDataProxy();
 
-    QScatter3DSeries *series();
+    QScatter3DSeries *series() const;
     int itemCount() const;
     const QScatterDataArray *array() const;
     const QScatterDataItem *itemAt(int index) const;
diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index b8a1a62b..8347104e 100644
--- a/src/datavisualization/data/qsurface3dseries.h
+++ b/src/datavisualization/data/qsurface3dseries.h
@@ -65,7 +65,7 @@ public:
 
 signals:
     void dataProxyChanged(QSurfaceDataProxy *proxy);
-    void selectedPointChanged(QPoint position);
+    void selectedPointChanged(const QPoint &position);
     void flatShadingEnabledChanged(bool enable);
     void flatShadingSupportedChanged(bool enable);
     void drawModeChanged(QSurface3DSeries::DrawFlags mode);
diff --git a/src/datavisualization/data/qsurfacedataitem.h b/src/datavisualization/data/qsurfacedataitem.h
index f305952b..1e4a384d 100644
--- a/src/datavisualization/data/qsurfacedataitem.h
+++ b/src/datavisualization/data/qsurfacedataitem.h
@@ -20,8 +20,7 @@
 #define QSURFACEDATAITEM_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
-
-#include <QVector3D>
+#include <QtGui/QVector3D>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -47,7 +46,7 @@ public:
     inline float z() const { return m_position.z(); }
 
 protected:
-    virtual void createExtraData();
+    void createExtraData();
 
     QSurfaceDataItemPrivate *d_ptr;
 
diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp
index b19f1f0a..34cea326 100644
--- a/src/datavisualization/data/qsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qsurfacedataproxy.cpp
@@ -131,7 +131,7 @@ QSurfaceDataProxy::~QSurfaceDataProxy()
  *
  *  The series this proxy is attached to.
  */
-QSurface3DSeries *QSurfaceDataProxy::series()
+QSurface3DSeries *QSurfaceDataProxy::series() const
 {
     return static_cast<QSurface3DSeries *>(d_ptr->series());
 }
@@ -186,6 +186,15 @@ void QSurfaceDataProxy::setItem(int rowIndex, int columnIndex, const QSurfaceDat
 }
 
 /*!
+ * Changes a single item at \a position to the \a item.
+ * The X-value of \a position indicates the row and the Y-value indicates the column.
+ */
+void QSurfaceDataProxy::setItem(const QPoint &position, const QSurfaceDataItem &item)
+{
+    setItem(position.x(), position.y(), item);
+}
+
+/*!
  * Adds a new \a row to the end of array. The new \a row must have
  * the same number of columns as the rows at the initial array.
  *
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index 9cfe3b77..475f1f2d 100644
--- a/src/datavisualization/data/qsurfacedataproxy.h
+++ b/src/datavisualization/data/qsurfacedataproxy.h
@@ -45,7 +45,7 @@ public:
     explicit QSurfaceDataProxy(QObject *parent = 0);
     virtual ~QSurfaceDataProxy();
 
-    QSurface3DSeries *series();
+    QSurface3DSeries *series() const;
     int rowCount() const;
     int columnCount() const;
     const QSurfaceDataArray *array() const;
@@ -58,6 +58,7 @@ public:
     void setRows(int rowIndex, const QSurfaceDataArray &rows);
 
     void setItem(int rowIndex, int columnIndex, const QSurfaceDataItem &item);
+    void setItem(const QPoint &position, const QSurfaceDataItem &item);
 
     int addRow(QSurfaceDataRow *row);
     int addRows(const QSurfaceDataArray &rows);
diff --git a/src/datavisualization/data/qsurfacedataproxy_p.h b/src/datavisualization/data/qsurfacedataproxy_p.h
index 658abe32..7c3486d2 100644
--- a/src/datavisualization/data/qsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qsurfacedataproxy_p.h
@@ -32,8 +32,6 @@
 #include "qsurfacedataproxy.h"
 #include "qabstractdataproxy_p.h"
 
-#include <QSize>
-
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QSurfaceDataProxyPrivate : public QAbstractDataProxyPrivate
diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp
index f89fa77c..08ed12f3 100644
--- a/src/datavisualization/data/scatteritemmodelhandler.cpp
+++ b/src/datavisualization/data/scatteritemmodelhandler.cpp
@@ -17,7 +17,6 @@
 ****************************************************************************/
 
 #include "scatteritemmodelhandler_p.h"
-#include <QTimer>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION