Docs updated after namespace macro removal

- some links do not work

Task-number: QTRD-2594
Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

25 files changed, 307 insertions, 158 deletions

diff --git a/src/datavisualization/data/abstractitemmodelhandler.cpp b/src/datavisualization/data/abstractitemmodelhandler.cpp
index 6cae79c8..33fe7791 100644
--- a/src/datavisualization/data/abstractitemmodelhandler.cpp
+++ b/src/datavisualization/data/abstractitemmodelhandler.cpp
@@ -21,6 +21,11 @@
 
 namespace QtDataVisualization {
 
+/*!
+ * \class QtDataVisualization::AbstractItemModelHandler
+ * \internal
+ */
+
 AbstractItemModelHandler::AbstractItemModelHandler(QObject *parent)
     : QObject(parent),
       resolvePending(0)
diff --git a/src/datavisualization/data/abstractrenderitem.cpp b/src/datavisualization/data/abstractrenderitem.cpp
index 268c1e9b..9ed51e43 100644
--- a/src/datavisualization/data/abstractrenderitem.cpp
+++ b/src/datavisualization/data/abstractrenderitem.cpp
@@ -20,6 +20,11 @@
 
 namespace QtDataVisualization {
 
+/*!
+ * \class QtDataVisualization::AbstractRenderItem
+ * \internal
+ */
+
 AbstractRenderItem::AbstractRenderItem()
     : m_selectionLabelItem(0)
 {
diff --git a/src/datavisualization/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp
index bd6f127b..5147e631 100644
--- a/src/datavisualization/data/baritemmodelhandler.cpp
+++ b/src/datavisualization/data/baritemmodelhandler.cpp
@@ -20,6 +20,11 @@
 
 namespace QtDataVisualization {
 
+/*!
+ * \class QtDataVisualization::BarItemModelHandler
+ * \internal
+ */
+
 BarItemModelHandler::BarItemModelHandler(QItemModelBarDataProxy *proxy, QObject *parent)
     : AbstractItemModelHandler(parent),
       m_proxy(proxy),
diff --git a/src/datavisualization/data/barrenderitem.cpp b/src/datavisualization/data/barrenderitem.cpp
index 678d6ba0..be96936e 100644
--- a/src/datavisualization/data/barrenderitem.cpp
+++ b/src/datavisualization/data/barrenderitem.cpp
@@ -21,6 +21,21 @@
 
 namespace QtDataVisualization {
 
+/*!
+ * \class QtDataVisualization::BarRenderItem
+ * \internal
+ */
+
+/*!
+ * \typedef QtDataVisualization::BarRenderItemRow
+ * \internal
+ */
+
+/*!
+ * \typedef QtDataVisualization::BarRenderItemArray
+ * \internal
+ */
+
 BarRenderItem::BarRenderItem()
     : AbstractRenderItem(),
       m_value(0),
diff --git a/src/datavisualization/data/barrenderitem_p.h b/src/datavisualization/data/barrenderitem_p.h
index 5a44e2fd..f44ba2b4 100644
--- a/src/datavisualization/data/barrenderitem_p.h
+++ b/src/datavisualization/data/barrenderitem_p.h
@@ -47,7 +47,15 @@ public:
     inline const QPoint &position() const { return m_position; }
 
     // Actual cached data value of the bar (needed to trigger label reformats)
-    inline void setValue(float value);
+    inline void setValue(float value)
+    {
+        m_value = value;
+         // Force reformatting on next access by setting label string to null string
+        if (!m_sliceLabel.isNull())
+            setSliceLabel(QString());
+        if (!m_selectionLabel.isNull())
+            setSelectionLabel(QString());
+    }
     inline float value() const { return m_value; }
 
     // Normalized bar height
@@ -77,16 +85,6 @@ protected:
     friend class QBarDataItem;
 };
 
-void BarRenderItem::setValue(float value)
-{
-    m_value = value;
-     // Force reformatting on next access by setting label string to null string
-    if (!m_sliceLabel.isNull())
-        setSliceLabel(QString());
-    if (!m_selectionLabel.isNull())
-        setSelectionLabel(QString());
-}
-
 typedef QVector<BarRenderItem> BarRenderItemRow;
 typedef QVector<BarRenderItemRow> BarRenderItemArray;
 
diff --git a/src/datavisualization/data/labelitem.cpp b/src/datavisualization/data/labelitem.cpp
index 78e8d0f2..658912fc 100644
--- a/src/datavisualization/data/labelitem.cpp
+++ b/src/datavisualization/data/labelitem.cpp
@@ -20,6 +20,11 @@
 
 namespace QtDataVisualization {
 
+/*!
+ * \class QtDataVisualization::LabelItem
+ * \internal
+ */
+
 LabelItem::LabelItem()
     : m_size(QSize(0, 0)),
       m_textureId(0)
diff --git a/src/datavisualization/data/qabstract3dseries.cpp b/src/datavisualization/data/qabstract3dseries.cpp
index 577a04a9..7c6798bc 100644
--- a/src/datavisualization/data/qabstract3dseries.cpp
+++ b/src/datavisualization/data/qabstract3dseries.cpp
@@ -24,7 +24,7 @@
 namespace QtDataVisualization {
 
 /*!
- * \class QAbstract3DSeries
+ * \class QtDataVisualization::QAbstract3DSeries
  * \inmodule QtDataVisualization
  * \brief Base class for all QtDataVisualization series.
  * \since Qt Data Visualization 1.0
@@ -34,11 +34,21 @@ namespace QtDataVisualization {
  */
 
 /*!
+ * \class QtDataVisualization::QAbstract3DSeriesChangeBitField
+ * \internal
+ */
+
+/*!
+ * \class QtDataVisualization::QAbstract3DSeriesThemeOverrideBitField
+ * \internal
+ */
+
+/*!
  * \qmltype Abstract3DSeries
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QAbstract3DSeries
+ * \instantiates QtDataVisualization::QAbstract3DSeries
  * \brief Base type for all QtDataVisualization series.
  *
  * This type is uncreatable, but contains properties that are exposed via subtypes.
@@ -46,6 +56,53 @@ namespace QtDataVisualization {
  */
 
 /*!
+ * \enum QAbstract3DSeries::SeriesType
+ *
+ * Type of the series.
+ *
+ * \value SeriesTypeNone
+ *        No series type.
+ * \value SeriesTypeBar
+ *        Series type for Q3DBars.
+ * \value SeriesTypeScatter
+ *        Series type for Q3DScatter.
+ * \value SeriesTypeSurface
+ *        Series type for Q3DSurface.
+ */
+
+/*!
+ *  \enum QAbstract3DSeries::Mesh
+ *
+ *  Predefined mesh types. All styles are not usable with all visualization types.
+ *
+ *  \value MeshUserDefined
+ *         User defined mesh, set via QAbstract3DSeries::userDefinedMesh property.
+ *  \value MeshBar
+ *         Basic rectangular bar.
+ *  \value MeshCube
+ *         Basic cube.
+ *  \value MeshPyramid
+ *         Four-sided pyramid.
+ *  \value MeshCone
+ *         Basic cone.
+ *  \value MeshCylinder
+ *         Basic cylinder.
+ *  \value MeshBevelBar
+ *         Slightly beveled (rounded) rectangular bar.
+ *  \value MeshBevelCube
+ *         Slightly beveled (rounded) cube.
+ *  \value MeshSphere
+ *         Sphere.
+ *  \value MeshMinimal
+ *         The minimal 3D mesh: a triangular pyramid. Usable only with Q3DScatter.
+ *  \value MeshArrow
+ *         Arrow pointing upwards.
+ *  \value MeshPoint
+ *         2D point. Usable only with Q3DScatter.
+ *         \b Note: Shadows and color gradients do not affect this style.
+ */
+
+/*!
  * \qmlproperty Abstract3DSeries.SeriesType Abstract3DSeries::type
  * The type of the series.
  */
@@ -168,53 +225,6 @@ namespace QtDataVisualization {
  */
 
 /*!
- * \enum QAbstract3DSeries::SeriesType
- *
- * Type of the series.
- *
- * \value SeriesTypeNone
- *        No series type.
- * \value SeriesTypeBar
- *        Series type for Q3DBars.
- * \value SeriesTypeScatter
- *        Series type for Q3DScatter.
- * \value SeriesTypeSurface
- *        Series type for Q3DSurface.
- */
-
-/*!
- *  \enum QAbstract3DSeries::Mesh
- *
- *  Predefined mesh types. All styles are not usable with all visualization types.
- *
- *  \value MeshUserDefined
- *         User defined mesh, set via QAbstract3DSeries::userDefinedMesh property.
- *  \value MeshBar
- *         Basic rectangular bar.
- *  \value MeshCube
- *         Basic cube.
- *  \value MeshPyramid
- *         Four-sided pyramid.
- *  \value MeshCone
- *         Basic cone.
- *  \value MeshCylinder
- *         Basic cylinder.
- *  \value MeshBevelBar
- *         Slightly beveled (rounded) rectangular bar.
- *  \value MeshBevelCube
- *         Slightly beveled (rounded) cube.
- *  \value MeshSphere
- *         Sphere.
- *  \value MeshMinimal
- *         The minimal 3D mesh: a triangular pyramid. Usable only with Q3DScatter.
- *  \value MeshArrow
- *         Arrow pointing upwards.
- *  \value MeshPoint
- *         2D point. Usable only with Q3DScatter.
- *         \b Note: Shadows and color gradients do not affect this style.
- */
-
-/*!
  * \internal
  */
 QAbstract3DSeries::QAbstract3DSeries(QAbstract3DSeriesPrivate *d, QObject *parent) :
@@ -519,6 +529,10 @@ QString QAbstract3DSeries::name() const
 }
 
 // QAbstract3DSeriesPrivate
+/*!
+ * \class QtDataVisualization::QAbstract3DSeriesPrivate
+ * \internal
+ */
 
 QAbstract3DSeriesPrivate::QAbstract3DSeriesPrivate(QAbstract3DSeries *q, QAbstract3DSeries::SeriesType type)
     : QObject(0),
diff --git a/src/datavisualization/data/qabstractdataproxy.cpp b/src/datavisualization/data/qabstractdataproxy.cpp
index 631bd8ac..ce377d2d 100644
--- a/src/datavisualization/data/qabstractdataproxy.cpp
+++ b/src/datavisualization/data/qabstractdataproxy.cpp
@@ -23,7 +23,7 @@
 namespace QtDataVisualization {
 
 /*!
- * \class QAbstractDataProxy
+ * \class QtDataVisualization::QAbstractDataProxy
  * \inmodule QtDataVisualization
  * \brief Base class for all QtDataVisualization data proxies.
  * \since Qt Data Visualization 1.0
@@ -37,7 +37,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QAbstractDataProxy
+ * \instantiates QtDataVisualization::QAbstractDataProxy
  * \brief Base type for all QtDataVisualization data proxies.
  *
  * This type is uncreatable, but contains properties that are exposed via subtypes.
@@ -91,6 +91,10 @@ QAbstractDataProxy::DataType QAbstractDataProxy::type() const
 }
 
 // QAbstractDataProxyPrivate
+/*!
+ * \class QtDataVisualization::QAbstractDataProxyPrivate
+ * \internal
+ */
 
 QAbstractDataProxyPrivate::QAbstractDataProxyPrivate(QAbstractDataProxy *q, QAbstractDataProxy::DataType type)
     : QObject(0),
diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp
index d7403712..edee80f5 100644
--- a/src/datavisualization/data/qbar3dseries.cpp
+++ b/src/datavisualization/data/qbar3dseries.cpp
@@ -22,7 +22,7 @@
 namespace QtDataVisualization {
 
 /*!
- * \class QBar3DSeries
+ * \class QtDataVisualization::QBar3DSeries
  * \inmodule QtDataVisualization
  * \brief Base series class for Q3DBars.
  * \since Qt Data Visualization 1.0
@@ -69,7 +69,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QBar3DSeries
+ * \instantiates QtDataVisualization::QBar3DSeries
  * \inherits Abstract3DSeries
  * \brief Base series type for Bars3D.
  *
@@ -209,6 +209,10 @@ const QBar3DSeriesPrivate *QBar3DSeries::dptrc() const
 }
 
 // QBar3DSeriesPrivate
+/*!
+ * \class QtDataVisualization::QBar3DSeriesPrivate
+ * \internal
+ */
 
 QBar3DSeriesPrivate::QBar3DSeriesPrivate(QBar3DSeries *q)
     : QAbstract3DSeriesPrivate(q, QAbstract3DSeries::SeriesTypeBar),
diff --git a/src/datavisualization/data/qbardataitem.cpp b/src/datavisualization/data/qbardataitem.cpp
index 0d69bc95..cd4178ab 100644
--- a/src/datavisualization/data/qbardataitem.cpp
+++ b/src/datavisualization/data/qbardataitem.cpp
@@ -21,7 +21,7 @@
 namespace QtDataVisualization {
 
 /*!
- * \class QBarDataItem
+ * \class QtDataVisualization::QBarDataItem
  * \inmodule QtDataVisualization
  * \brief The QBarDataItem class provides a container for resolved data to be added to bar graphs.
  * \since Qt Data Visualization 1.0
@@ -99,6 +99,10 @@ void QBarDataItem::createExtraData()
         d_ptr = new QBarDataItemPrivate;
 }
 
+/*!
+ * \class QtDataVisualization::QBarDataItemPrivate
+ * \internal
+ */
 QBarDataItemPrivate::QBarDataItemPrivate()
 {
 }
diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp
index 5c89f7d4..93645f38 100644
--- a/src/datavisualization/data/qbardataproxy.cpp
+++ b/src/datavisualization/data/qbardataproxy.cpp
@@ -23,7 +23,7 @@
 namespace QtDataVisualization {
 
 /*!
- * \class QBarDataProxy
+ * \class QtDataVisualization::QBarDataProxy
  * \inmodule QtDataVisualization
  * \brief Base proxy class for Q3DBars.
  * \since Qt Data Visualization 1.0
@@ -48,11 +48,23 @@ namespace QtDataVisualization {
  */
 
 /*!
+ * \typedef QtDataVisualization::QBarDataRow
+ *
+ * A vector of QBarDataItems.
+ */
+
+/*!
+ * \typedef QtDataVisualization::QBarDataArray
+ *
+ * A list of pointers to QBarDataRows.
+ */
+
+/*!
  * \qmltype BarDataProxy
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QBarDataProxy
+ * \instantiates QtDataVisualization::QBarDataProxy
  * \inherits AbstractDataProxy
  * \brief Base proxy type for Bars3D.
  *
@@ -481,6 +493,10 @@ const QBarDataProxyPrivate *QBarDataProxy::dptrc() const
 
 // QBarDataProxyPrivate
 
+/*!
+ * \class QtDataVisualization::QBarDataProxyPrivate
+ * \internal
+ */
 QBarDataProxyPrivate::QBarDataProxyPrivate(QBarDataProxy *q)
     : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeBar),
       m_dataArray(new QBarDataArray)
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
index 96d6e45a..21f7ae8e 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
@@ -25,7 +25,7 @@ const float defaultMinValue = 0.0f;
 const float defaultMaxValue = 10.0f;
 
 /*!
- * \class QHeightMapSurfaceDataProxy
+ * \class QtDataVisualization::QHeightMapSurfaceDataProxy
  * \inmodule QtDataVisualization
  * \brief Base proxy class for Q3DSurface.
  * \since Qt Data Visualization 1.0
@@ -46,7 +46,7 @@ const float defaultMaxValue = 10.0f;
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QHeightMapSurfaceDataProxy
+ * \instantiates QtDataVisualization::QHeightMapSurfaceDataProxy
  * \inherits SurfaceDataProxy
  * \brief Base proxy type for Surface3D.
  *
@@ -300,6 +300,10 @@ const QHeightMapSurfaceDataProxyPrivate *QHeightMapSurfaceDataProxy::dptrc() con
 //  QHeightMapSurfaceDataProxyPrivate
 //
 
+/*!
+ * \class QtDataVisualization::QHeightMapSurfaceDataProxyPrivate
+ * \internal
+ */
 QHeightMapSurfaceDataProxyPrivate::QHeightMapSurfaceDataProxyPrivate(QHeightMapSurfaceDataProxy *q)
     : QSurfaceDataProxyPrivate(q),
       m_minXValue(defaultMinValue),
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp
index 77c0463e..52a8cbb5 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp
@@ -23,7 +23,7 @@
 namespace QtDataVisualization {
 
 /*!
- * \class QItemModelBarDataProxy
+ * \class QtDataVisualization::QItemModelBarDataProxy
  * \inmodule QtDataVisualization
  * \brief Proxy class for presenting data in item models with Q3DBars.
  * \since Qt Data Visualization 1.0
@@ -66,7 +66,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QItemModelBarDataProxy
+ * \instantiates QtDataVisualization::QItemModelBarDataProxy
  * \inherits BarDataProxy
  * \brief Proxy class for presenting data in item models with Bars3D.
  *
@@ -446,6 +446,31 @@ const QItemModelBarDataProxyPrivate *QItemModelBarDataProxy::dptrc() const
     return static_cast<const QItemModelBarDataProxyPrivate *>(d_ptr.data());
 }
 
+// QItemModelBarDataProxyPrivate
+
+/*!
+ * \class QtDataVisualization::QItemModelBarDataProxyPrivate
+ * \internal
+ */
+QItemModelBarDataProxyPrivate::QItemModelBarDataProxyPrivate(QItemModelBarDataProxy *q)
+    : QBarDataProxyPrivate(q),
+      m_itemModelHandler(new BarItemModelHandler(q)),
+      m_useModelCategories(false),
+      m_autoRowCategories(true),
+      m_autoColumnCategories(true)
+{
+}
+
+QItemModelBarDataProxyPrivate::~QItemModelBarDataProxyPrivate()
+{
+    delete m_itemModelHandler;
+}
+
+QItemModelBarDataProxy *QItemModelBarDataProxyPrivate::qptr()
+{
+    return static_cast<QItemModelBarDataProxy *>(q_ptr);
+}
+
 void QItemModelBarDataProxyPrivate::connectItemModelHandler()
 {
     QObject::connect(m_itemModelHandler, &BarItemModelHandler::itemModelChanged,
@@ -468,25 +493,4 @@ void QItemModelBarDataProxyPrivate::connectItemModelHandler()
                      m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
 }
 
-// QItemModelBarDataProxyPrivate
-
-QItemModelBarDataProxyPrivate::QItemModelBarDataProxyPrivate(QItemModelBarDataProxy *q)
-    : QBarDataProxyPrivate(q),
-      m_itemModelHandler(new BarItemModelHandler(q)),
-      m_useModelCategories(false),
-      m_autoRowCategories(true),
-      m_autoColumnCategories(true)
-{
-}
-
-QItemModelBarDataProxyPrivate::~QItemModelBarDataProxyPrivate()
-{
-    delete m_itemModelHandler;
-}
-
-QItemModelBarDataProxy *QItemModelBarDataProxyPrivate::qptr()
-{
-    return static_cast<QItemModelBarDataProxy *>(q_ptr);
-}
-
 }
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
index e2ba8fec..869d8e8c 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
@@ -23,7 +23,7 @@
 namespace QtDataVisualization {
 
 /*!
- * \class QItemModelScatterDataProxy
+ * \class QtDataVisualization::QItemModelScatterDataProxy
  * \inmodule QtDataVisualization
  * \brief Proxy class for presenting data in item models with Q3DScatter.
  * \since Qt Data Visualization 1.0
@@ -52,7 +52,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QItemModelScatterDataProxy
+ * \instantiates QtDataVisualization::QItemModelScatterDataProxy
  * \inherits ScatterDataProxy
  * \brief Proxy class for presenting data in item models with Scatter3D.
  *
@@ -235,20 +235,12 @@ const QItemModelScatterDataProxyPrivate *QItemModelScatterDataProxy::dptrc() con
     return static_cast<const QItemModelScatterDataProxyPrivate *>(d_ptr.data());
 }
 
-void QItemModelScatterDataProxyPrivate::connectItemModelHandler()
-{
-    QObject::connect(m_itemModelHandler, &ScatterItemModelHandler::itemModelChanged,
-                     qptr(), &QItemModelScatterDataProxy::itemModelChanged);
-    QObject::connect(qptr(), &QItemModelScatterDataProxy::xPosRoleChanged,
-                     m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
-    QObject::connect(qptr(), &QItemModelScatterDataProxy::yPosRoleChanged,
-                     m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
-    QObject::connect(qptr(), &QItemModelScatterDataProxy::zPosRoleChanged,
-                     m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
-}
-
 // QItemModelScatterDataProxyPrivate
 
+/*!
+ * \class QtDataVisualization::QItemModelScatterDataProxyPrivate
+ * \internal
+ */
 QItemModelScatterDataProxyPrivate::QItemModelScatterDataProxyPrivate(QItemModelScatterDataProxy *q)
     : QScatterDataProxyPrivate(q),
       m_itemModelHandler(new ScatterItemModelHandler(q))
@@ -265,4 +257,16 @@ QItemModelScatterDataProxy *QItemModelScatterDataProxyPrivate::qptr()
     return static_cast<QItemModelScatterDataProxy *>(q_ptr);
 }
 
+void QItemModelScatterDataProxyPrivate::connectItemModelHandler()
+{
+    QObject::connect(m_itemModelHandler, &ScatterItemModelHandler::itemModelChanged,
+                     qptr(), &QItemModelScatterDataProxy::itemModelChanged);
+    QObject::connect(qptr(), &QItemModelScatterDataProxy::xPosRoleChanged,
+                     m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
+    QObject::connect(qptr(), &QItemModelScatterDataProxy::yPosRoleChanged,
+                     m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
+    QObject::connect(qptr(), &QItemModelScatterDataProxy::zPosRoleChanged,
+                     m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
+}
+
 }
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
index 7ca9842e..b387bd7b 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
@@ -25,7 +25,7 @@ namespace QtDataVisualization {
 // TODO: CHECK DOCUMENTATION!
 
 /*!
- * \class QItemModelSurfaceDataProxy
+ * \class QtDataVisualization::QItemModelSurfaceDataProxy
  * \inmodule QtDataVisualization
  * \brief Proxy class for presenting data in item models with Q3DSurface.
  * \since Qt Data Visualization 1.0
@@ -69,7 +69,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QItemModelSurfaceDataProxy
+ * \instantiates QtDataVisualization::QItemModelSurfaceDataProxy
  * \inherits SurfaceDataProxy
  * \brief Proxy class for presenting data in item models with Surface3D.
  *
@@ -456,6 +456,31 @@ const QItemModelSurfaceDataProxyPrivate *QItemModelSurfaceDataProxy::dptrc() con
     return static_cast<const QItemModelSurfaceDataProxyPrivate *>(d_ptr.data());
 }
 
+// QItemModelSurfaceDataProxyPrivate
+
+/*!
+ * \class QtDataVisualization::QItemModelSurfaceDataProxyPrivate
+ * \internal
+ */
+QItemModelSurfaceDataProxyPrivate::QItemModelSurfaceDataProxyPrivate(QItemModelSurfaceDataProxy *q)
+    : QSurfaceDataProxyPrivate(q),
+      m_itemModelHandler(new SurfaceItemModelHandler(q)),
+      m_useModelCategories(false),
+      m_autoRowCategories(true),
+      m_autoColumnCategories(true)
+{
+}
+
+QItemModelSurfaceDataProxyPrivate::~QItemModelSurfaceDataProxyPrivate()
+{
+    delete m_itemModelHandler;
+}
+
+QItemModelSurfaceDataProxy *QItemModelSurfaceDataProxyPrivate::qptr()
+{
+    return static_cast<QItemModelSurfaceDataProxy *>(q_ptr);
+}
+
 void QItemModelSurfaceDataProxyPrivate::connectItemModelHandler()
 {
     QObject::connect(m_itemModelHandler, &SurfaceItemModelHandler::itemModelChanged,
@@ -478,25 +503,4 @@ void QItemModelSurfaceDataProxyPrivate::connectItemModelHandler()
                      m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
 }
 
-// QItemModelSurfaceDataProxyPrivate
-
-QItemModelSurfaceDataProxyPrivate::QItemModelSurfaceDataProxyPrivate(QItemModelSurfaceDataProxy *q)
-    : QSurfaceDataProxyPrivate(q),
-      m_itemModelHandler(new SurfaceItemModelHandler(q)),
-      m_useModelCategories(false),
-      m_autoRowCategories(true),
-      m_autoColumnCategories(true)
-{
-}
-
-QItemModelSurfaceDataProxyPrivate::~QItemModelSurfaceDataProxyPrivate()
-{
-    delete m_itemModelHandler;
-}
-
-QItemModelSurfaceDataProxy *QItemModelSurfaceDataProxyPrivate::qptr()
-{
-    return static_cast<QItemModelSurfaceDataProxy *>(q_ptr);
-}
-
 }
diff --git a/src/datavisualization/data/qscatter3dseries.cpp b/src/datavisualization/data/qscatter3dseries.cpp
index 38e564f5..edc64989 100644
--- a/src/datavisualization/data/qscatter3dseries.cpp
+++ b/src/datavisualization/data/qscatter3dseries.cpp
@@ -22,7 +22,7 @@
 namespace QtDataVisualization {
 
 /*!
- * \class QScatter3DSeries
+ * \class QtDataVisualization::QScatter3DSeries
  * \inmodule QtDataVisualization
  * \brief Base series class for Q3DScatter.
  * \since Qt Data Visualization 1.0
@@ -65,7 +65,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QScatter3DSeries
+ * \instantiates QtDataVisualization::QScatter3DSeries
  * \inherits Abstract3DSeries
  * \brief Base series type for Scatter3D.
  *
@@ -234,6 +234,10 @@ const QScatter3DSeriesPrivate *QScatter3DSeries::dptrc() const
 
 // QScatter3DSeriesPrivate
 
+/*!
+ * \class QtDataVisualization::QScatter3DSeriesPrivate
+ * \internal
+ */
 QScatter3DSeriesPrivate::QScatter3DSeriesPrivate(QScatter3DSeries *q)
     : QAbstract3DSeriesPrivate(q, QAbstract3DSeries::SeriesTypeScatter),
       m_selectedItem(Scatter3DController::invalidSelectionIndex()),
diff --git a/src/datavisualization/data/qscatterdataitem.cpp b/src/datavisualization/data/qscatterdataitem.cpp
index cb6d5c70..56d8cd35 100644
--- a/src/datavisualization/data/qscatterdataitem.cpp
+++ b/src/datavisualization/data/qscatterdataitem.cpp
@@ -21,7 +21,7 @@
 namespace QtDataVisualization {
 
 /*!
- * \class QScatterDataItem
+ * \class QtDataVisualization::QScatterDataItem
  * \inmodule QtDataVisualization
  * \brief The QScatterDataItem class provides a container for resolved data to be added to scatter
  * graphs.
@@ -140,6 +140,10 @@ void QScatterDataItem::createExtraData()
         d_ptr = new QScatterDataItemPrivate;
 }
 
+/*!
+ * \class QtDataVisualization::QScatterDataItemPrivate
+ * \internal
+ */
 QScatterDataItemPrivate::QScatterDataItemPrivate()
 {
 }
diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp
index a58149a1..c9292727 100644
--- a/src/datavisualization/data/qscatterdataproxy.cpp
+++ b/src/datavisualization/data/qscatterdataproxy.cpp
@@ -23,7 +23,7 @@
 namespace QtDataVisualization {
 
 /*!
- * \class QScatterDataProxy
+ * \class QtDataVisualization::QScatterDataProxy
  * \inmodule QtDataVisualization
  * \brief Base proxy class for Q3DScatter.
  * \since Qt Data Visualization 1.0
@@ -36,11 +36,17 @@ namespace QtDataVisualization {
  */
 
 /*!
+ * \typedef QtDataVisualization::QScatterDataArray
+ *
+ * A vector of QScatterDataItems.
+ */
+
+/*!
  * \qmltype ScatterDataProxy
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QScatterDataProxy
+ * \instantiates QtDataVisualization::QScatterDataProxy
  * \inherits AbstractDataProxy
  * \brief Base proxy class for Scatter3D.
  *
@@ -277,6 +283,10 @@ const QScatterDataProxyPrivate *QScatterDataProxy::dptrc() const
 
 // QScatterDataProxyPrivate
 
+/*!
+ * \class QtDataVisualization::QScatterDataProxyPrivate
+ * \internal
+ */
 QScatterDataProxyPrivate::QScatterDataProxyPrivate(QScatterDataProxy *q)
     : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeScatter),
       m_dataArray(new QScatterDataArray)
diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp
index 0994e010..c34c1415 100644
--- a/src/datavisualization/data/qsurface3dseries.cpp
+++ b/src/datavisualization/data/qsurface3dseries.cpp
@@ -22,7 +22,7 @@
 namespace QtDataVisualization {
 
 /*!
- * \class QSurface3DSeries
+ * \class QtDataVisualization::QSurface3DSeries
  * \inmodule QtDataVisualization
  * \brief Base series class for Q3DSurface.
  * \since Qt Data Visualization 1.0
@@ -68,7 +68,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QSurface3DSeries
+ * \instantiates QtDataVisualization::QSurface3DSeries
  * \inherits Abstract3DSeries
  * \brief Base series type for Surfaces3D.
  *
@@ -302,6 +302,10 @@ const QSurface3DSeriesPrivate *QSurface3DSeries::dptrc() const
 
 // QSurface3DSeriesPrivate
 
+/*!
+ * \class QtDataVisualization::QSurface3DSeriesPrivate
+ * \internal
+ */
 QSurface3DSeriesPrivate::QSurface3DSeriesPrivate(QSurface3DSeries *q)
     : QAbstract3DSeriesPrivate(q, QAbstract3DSeries::SeriesTypeSurface),
       m_selectedPoint(Surface3DController::invalidSelectionPosition()),
diff --git a/src/datavisualization/data/qsurfacedataitem.cpp b/src/datavisualization/data/qsurfacedataitem.cpp
index 291038e2..b531d6b6 100644
--- a/src/datavisualization/data/qsurfacedataitem.cpp
+++ b/src/datavisualization/data/qsurfacedataitem.cpp
@@ -21,7 +21,7 @@
 namespace QtDataVisualization {
 
 /*!
- * \class QSurfaceDataItem
+ * \class QtDataVisualization::QSurfaceDataItem
  * \inmodule QtDataVisualization
  * \brief The QSurfaceDataItem class provides a container for resolved data to be added to surface
  * graphs.
@@ -132,6 +132,10 @@ void QSurfaceDataItem::createExtraData()
         d_ptr = new QSurfaceDataItemPrivate;
 }
 
+/*!
+ * \class QtDataVisualization::QSurfaceDataItemPrivate
+ * \internal
+ */
 QSurfaceDataItemPrivate::QSurfaceDataItemPrivate()
 {
 }
diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp
index e3a6cb13..dbfcfa86 100644
--- a/src/datavisualization/data/qsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qsurfacedataproxy.cpp
@@ -23,7 +23,7 @@
 namespace QtDataVisualization {
 
 /*!
- * \class QSurfaceDataProxy
+ * \class QtDataVisualization::QSurfaceDataProxy
  * \inmodule QtDataVisualization
  * \brief Base proxy class for Q3DSurface.
  * \since Qt Data Visualization 1.0
@@ -57,11 +57,23 @@ namespace QtDataVisualization {
  */
 
 /*!
+ * \typedef QtDataVisualization::QSurfaceDataRow
+ *
+ * A vector of QSurfaceDataItems.
+ */
+
+/*!
+ * \typedef QtDataVisualization::QSurfaceDataArray
+ *
+ * A list of pointers to QSurfaceDataRows.
+ */
+
+/*!
  * \qmltype SurfaceDataProxy
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QSurfaceDataProxy
+ * \instantiates QtDataVisualization::QSurfaceDataProxy
  * \inherits AbstractDataProxy
  * \brief Base proxy class for Surface3D.
  *
@@ -347,6 +359,10 @@ const QSurfaceDataProxyPrivate *QSurfaceDataProxy::dptrc() const
 //  QSurfaceDataProxyPrivate
 //
 
+/*!
+ * \class QtDataVisualization::QSurfaceDataProxyPrivate
+ * \internal
+ */
 QSurfaceDataProxyPrivate::QSurfaceDataProxyPrivate(QSurfaceDataProxy *q)
     : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeSurface),
       m_dataArray(new QSurfaceDataArray)
diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp
index f5bac672..ac7e69e8 100644
--- a/src/datavisualization/data/scatteritemmodelhandler.cpp
+++ b/src/datavisualization/data/scatteritemmodelhandler.cpp
@@ -21,6 +21,11 @@
 
 namespace QtDataVisualization {
 
+/*!
+ * \class QtDataVisualization::ScatterItemModelHandler
+ * \internal
+ */
+
 ScatterItemModelHandler::ScatterItemModelHandler(QItemModelScatterDataProxy *proxy, QObject *parent)
     : AbstractItemModelHandler(parent),
       m_proxy(proxy),
diff --git a/src/datavisualization/data/scatterrenderitem.cpp b/src/datavisualization/data/scatterrenderitem.cpp
index be6d3852..5b31c5b2 100644
--- a/src/datavisualization/data/scatterrenderitem.cpp
+++ b/src/datavisualization/data/scatterrenderitem.cpp
@@ -22,6 +22,16 @@
 
 namespace QtDataVisualization {
 
+/*!
+ * \class QtDataVisualization::ScatterRenderItem
+ * \internal
+ */
+
+/*!
+ * \typedef ScatterRenderItemArray
+ * \internal
+ */
+
 ScatterRenderItem::ScatterRenderItem()
     : AbstractRenderItem(),
       m_visible(false)
diff --git a/src/datavisualization/data/scatterrenderitem_p.h b/src/datavisualization/data/scatterrenderitem_p.h
index 7b7d51f6..5e596505 100644
--- a/src/datavisualization/data/scatterrenderitem_p.h
+++ b/src/datavisualization/data/scatterrenderitem_p.h
@@ -43,10 +43,23 @@ public:
     virtual ~ScatterRenderItem();
 
     inline const QVector3D &position() const { return m_position; }
-    inline void setPosition(const QVector3D &pos);
+    inline void setPosition(const QVector3D &pos)
+    {
+        if (m_position != pos) {
+            m_position = pos;
+            // Force reformatting on next access by setting label string to null string
+            if (!m_selectionLabel.isNull())
+                setSelectionLabel(QString());
+        }
+    }
 
     inline QQuaternion rotation() const { return m_rotation; }
-    inline void setRotation(const QQuaternion &rotation);
+    inline void setRotation(const QQuaternion &rotation)
+    {
+        if (m_rotation != rotation)
+            m_rotation = rotation;
+    }
+
 
     inline bool isVisible() const { return m_visible; }
     inline void setVisible(bool visible) { m_visible = visible; }
@@ -63,23 +76,6 @@ protected:
 
     friend class QScatterDataItem;
 };
-
-void ScatterRenderItem::setPosition(const QVector3D &pos)
-{
-    if (m_position != pos) {
-        m_position = pos;
-        // Force reformatting on next access by setting label string to null string
-        if (!m_selectionLabel.isNull())
-            setSelectionLabel(QString());
-    }
-}
-
-void ScatterRenderItem::setRotation(const QQuaternion &rotation)
-{
-    if (m_rotation != rotation)
-        m_rotation = rotation;
-}
-
 typedef QVector<ScatterRenderItem> ScatterRenderItemArray;
 
 }
diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp
index ac1a8b81..3256e660 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler.cpp
+++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp
@@ -20,6 +20,11 @@
 
 namespace QtDataVisualization {
 
+/*!
+ * \class QtDataVisualization::SurfaceItemModelHandler
+ * \internal
+ */
+
 SurfaceItemModelHandler::SurfaceItemModelHandler(QItemModelSurfaceDataProxy *proxy, QObject *parent)
     : AbstractItemModelHandler(parent),
       m_proxy(proxy),