Reintroduced namespace macros, part 2

Added changes lost in merge

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

19 files changed, 61 insertions, 105 deletions

diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp
index ff64aca7..1597b7ba 100644
--- a/src/datavisualization/data/qbar3dseries.cpp
+++ b/src/datavisualization/data/qbar3dseries.cpp
@@ -19,10 +19,10 @@
 #include "qbar3dseries_p.h"
 #include "bars3dcontroller_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::QBar3DSeries
+ * \class 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 QtDataVisualization::QBar3DSeries
+ * \instantiates QBar3DSeries
  * \inherits Abstract3DSeries
  * \brief Base series type for Bars3D.
  *
@@ -217,10 +217,6 @@ const QBar3DSeriesPrivate *QBar3DSeries::dptrc() const
 }
 
 // QBar3DSeriesPrivate
-/*!
- * \class QtDataVisualization::QBar3DSeriesPrivate
- * \internal
- */
 
 QBar3DSeriesPrivate::QBar3DSeriesPrivate(QBar3DSeries *q)
     : QAbstract3DSeriesPrivate(q, QAbstract3DSeries::SeriesTypeBar),
@@ -287,4 +283,4 @@ void QBar3DSeriesPrivate::setSelectedBar(const QPoint &position)
     }
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp
index 351575a1..9957e8af 100644
--- a/src/datavisualization/data/qbardataproxy.cpp
+++ b/src/datavisualization/data/qbardataproxy.cpp
@@ -48,15 +48,15 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  */
 
 /*!
- * \typedef QBarDataRow
+ * \typedef QtDataVisualization::QBarDataRow
  *
- * A vector of QBarDataItems.
+ * A vector of \l {QBarDataItem}s.
  */
 
 /*!
- * \typedef QBarDataArray
+ * \typedef QtDataVisualization::QBarDataArray
  *
- * A list of pointers to QBarDataRows.
+ * A list of pointers to \l {QBarDataRow}s.
  */
 
 /*!
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index 4a1e547f..7843e5dc 100644
--- a/src/datavisualization/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -24,14 +24,17 @@
 #include <QVector>
 #include <QStringList>
 
+namespace QtDataVisualization {
+// typedefs introduced this way because QDoc doesn't understand namespace macros
+typedef QVector<QBarDataItem> QBarDataRow;
+typedef QList<QBarDataRow *> QBarDataArray;
+}
+
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QBarDataProxyPrivate;
 class QBar3DSeries;
 
-typedef QVector<QBarDataItem> QBarDataRow;
-typedef QList<QBarDataRow *> QBarDataArray;
-
 class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy
 {
     Q_OBJECT
diff --git a/src/datavisualization/data/qscatter3dseries.cpp b/src/datavisualization/data/qscatter3dseries.cpp
index 89f37995..78594272 100644
--- a/src/datavisualization/data/qscatter3dseries.cpp
+++ b/src/datavisualization/data/qscatter3dseries.cpp
@@ -19,10 +19,10 @@
 #include "qscatter3dseries_p.h"
 #include "scatter3dcontroller_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::QScatter3DSeries
+ * \class 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 QtDataVisualization::QScatter3DSeries
+ * \instantiates QScatter3DSeries
  * \inherits Abstract3DSeries
  * \brief Base series type for Scatter3D.
  *
@@ -242,10 +242,6 @@ const QScatter3DSeriesPrivate *QScatter3DSeries::dptrc() const
 
 // QScatter3DSeriesPrivate
 
-/*!
- * \class QtDataVisualization::QScatter3DSeriesPrivate
- * \internal
- */
 QScatter3DSeriesPrivate::QScatter3DSeriesPrivate(QScatter3DSeries *q)
     : QAbstract3DSeriesPrivate(q, QAbstract3DSeries::SeriesTypeScatter),
       m_selectedItem(Scatter3DController::invalidSelectionIndex()),
@@ -313,4 +309,4 @@ void QScatter3DSeriesPrivate::setItemSize(float size)
         m_controller->markSeriesVisualsDirty();
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp
index 7db508ea..2a5ccbdb 100644
--- a/src/datavisualization/data/qscatterdataproxy.cpp
+++ b/src/datavisualization/data/qscatterdataproxy.cpp
@@ -36,9 +36,9 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  */
 
 /*!
- * \typedef QScatterDataArray
+ * \typedef QtDataVisualization::QScatterDataArray
  *
- * A vector of QScatterDataItems.
+ * A vector of \l {QScatterDataItem}s.
  */
 
 /*!
diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h
index b99f503a..7c25440d 100644
--- a/src/datavisualization/data/qscatterdataproxy.h
+++ b/src/datavisualization/data/qscatterdataproxy.h
@@ -22,13 +22,16 @@
 #include <QtDataVisualization/qabstractdataproxy.h>
 #include <QtDataVisualization/qscatterdataitem.h>
 
+namespace QtDataVisualization {
+// typedef introduced this way because QDoc doesn't understand namespace macros
+typedef QVector<QScatterDataItem> QScatterDataArray;
+}
+
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QScatterDataProxyPrivate;
 class QScatter3DSeries;
 
-typedef QVector<QScatterDataItem> QScatterDataArray;
-
 class QT_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy
 {
     Q_OBJECT
diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp
index ec146e22..af53bab4 100644
--- a/src/datavisualization/data/qsurface3dseries.cpp
+++ b/src/datavisualization/data/qsurface3dseries.cpp
@@ -19,10 +19,10 @@
 #include "qsurface3dseries_p.h"
 #include "surface3dcontroller_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::QSurface3DSeries
+ * \class 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 QtDataVisualization::QSurface3DSeries
+ * \instantiates QSurface3DSeries
  * \inherits Abstract3DSeries
  * \brief Base series type for Surfaces3D.
  *
@@ -310,10 +310,6 @@ const QSurface3DSeriesPrivate *QSurface3DSeries::dptrc() const
 
 // QSurface3DSeriesPrivate
 
-/*!
- * \class QtDataVisualization::QSurface3DSeriesPrivate
- * \internal
- */
 QSurface3DSeriesPrivate::QSurface3DSeriesPrivate(QSurface3DSeries *q)
     : QAbstract3DSeriesPrivate(q, QAbstract3DSeries::SeriesTypeSurface),
       m_selectedPoint(Surface3DController::invalidSelectionPosition()),
@@ -392,4 +388,4 @@ void QSurface3DSeriesPrivate::setDrawMode(QSurface3DSeries::DrawFlags mode)
         m_controller->markSeriesVisualsDirty();
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp
index 541b1d8f..bcb60f8c 100644
--- a/src/datavisualization/data/qsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qsurfacedataproxy.cpp
@@ -57,15 +57,15 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  */
 
 /*!
- * \typedef QSurfaceDataRow
+ * \typedef QtDataVisualization::QSurfaceDataRow
  *
- * A vector of QSurfaceDataItems.
+ * A vector of \l {QSurfaceDataItem}s.
  */
 
 /*!
- * \typedef QSurfaceDataArray
+ * \typedef QtDataVisualization::QSurfaceDataArray
  *
- * A list of pointers to QSurfaceDataRows.
+ * A list of pointers to \l {QSurfaceDataRow}s.
  */
 
 /*!
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index b1f16cb3..ffa20989 100644
--- a/src/datavisualization/data/qsurfacedataproxy.h
+++ b/src/datavisualization/data/qsurfacedataproxy.h
@@ -22,14 +22,17 @@
 #include <QtDataVisualization/qabstractdataproxy.h>
 #include <QtDataVisualization/qsurfacedataitem.h>
 
+namespace QtDataVisualization {
+// typedefs introduced this way because QDoc doesn't understand namespace macros
+typedef QVector<QSurfaceDataItem> QSurfaceDataRow;
+typedef QList<QSurfaceDataRow *> QSurfaceDataArray;
+}
+
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QSurfaceDataProxyPrivate;
 class QSurface3DSeries;
 
-typedef QVector<QSurfaceDataItem> QSurfaceDataRow;
-typedef QList<QSurfaceDataRow *> QSurfaceDataArray;
-
 class QT_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy
 {
     Q_OBJECT
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index 7947bd7d..17c1e1fb 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -42,7 +42,7 @@
 
 class QFont;
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class CameraHelper;
 class Abstract3DRenderer;
@@ -281,6 +281,6 @@ private:
     friend class Bars3DController;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index 29262f41..95840b0a 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -27,12 +27,7 @@
 #include "q3dtheme_p.h"
 #include "objecthelper_p.h"
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::Abstract3DRenderer
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller)
     : QObject(0),
@@ -440,4 +435,4 @@ void Abstract3DRenderer::fixGradientAndGenerateTexture(QLinearGradient *gradient
     *gradientTexture = m_textureHelper->createGradientTexture(*gradient);
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index ae6a1c48..f91a74cc 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -30,17 +30,7 @@
 #include <QMatrix4x4>
 #include <qmath.h>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::Bars3DController
- * \internal
- */
-
-/*!
- * \class QtDataVisualization::Bars3DChangeBitField
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 Bars3DController::Bars3DController(QRect boundRect, Q3DScene *scene)
     : Abstract3DController(boundRect, scene),
@@ -587,4 +577,4 @@ QAbstract3DAxis *Bars3DController::createDefaultAxis(QAbstract3DAxis::AxisOrient
     return defaultAxis;
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h
index e0d0786f..54520b32 100644
--- a/src/datavisualization/engine/bars3dcontroller_p.h
+++ b/src/datavisualization/engine/bars3dcontroller_p.h
@@ -34,7 +34,7 @@
 
 //#define DISPLAY_RENDER_SPEED
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Bars3DRenderer;
 class QBar3DSeries;
@@ -136,7 +136,6 @@ private:
 
 };
 
-
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp
index af0dc7ad..29ceabc9 100644
--- a/src/datavisualization/engine/qabstract3dgraph.cpp
+++ b/src/datavisualization/engine/qabstract3dgraph.cpp
@@ -29,10 +29,10 @@
 #include <QPainter>
 
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::QAbstract3DGraph
+ * \class QAbstract3DGraph
  * \inmodule QtDataVisualization
  * \brief The QAbstract3DGraph class provides a window and render loop for graphs.
  * \since Qt Data Visualization 1.0
@@ -429,10 +429,6 @@ void QAbstract3DGraph::wheelEvent(QWheelEvent *event)
     d_ptr->m_visualController->wheelEvent(event);
 }
 
-/*!
- * \class QtDataVisualization::QAbstract3DGraphPrivate
- * \internal
- */
 QAbstract3DGraphPrivate::QAbstract3DGraphPrivate(QAbstract3DGraph *q)
     : QObject(0),
       q_ptr(q),
@@ -508,4 +504,4 @@ void QAbstract3DGraphPrivate::renderNow()
     m_context->swapBuffers(q_ptr);
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h
index 5383850e..e4cec5e2 100644
--- a/src/datavisualization/engine/qabstract3dgraph.h
+++ b/src/datavisualization/engine/qabstract3dgraph.h
@@ -25,7 +25,7 @@
 #include <QOpenGLFunctions>
 #include <QScreen>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QAbstract3DGraphPrivate;
 class Abstract3DController;
@@ -125,6 +125,6 @@ private:
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstract3DGraph::SelectionFlags)
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp
index a3df9288..c3f03fb9 100644
--- a/src/datavisualization/engine/scatter3dcontroller.cpp
+++ b/src/datavisualization/engine/scatter3dcontroller.cpp
@@ -27,17 +27,7 @@
 #include <QMatrix4x4>
 #include <qmath.h>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::Scatter3DController
- * \internal
- */
-
-/*!
- * \class QtDataVisualization::Scatter3DChangeBitField
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 Scatter3DController::Scatter3DController(QRect boundRect, Q3DScene *scene)
     : Abstract3DController(boundRect, scene),
@@ -384,4 +374,4 @@ void Scatter3DController::adjustValueAxisRange()
     }
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h
index 6e4d391a..35f4015d 100644
--- a/src/datavisualization/engine/scatter3dcontroller_p.h
+++ b/src/datavisualization/engine/scatter3dcontroller_p.h
@@ -34,7 +34,7 @@
 
 //#define DISPLAY_RENDER_SPEED
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Scatter3DRenderer;
 class QScatterDataProxy;
@@ -99,7 +99,6 @@ private:
     Q_DISABLE_COPY(Scatter3DController)
 };
 
-
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index c69ad5bd..cae97d90 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -30,17 +30,7 @@
 
 #include <QDebug>
 
-namespace QtDataVisualization {
-
-/*!
- * \class QtDataVisualization::Surface3DController
- * \internal
- */
-
-/*!
- * \class QtDataVisualization::Surface3DChangeBitField
- * \internal
- */
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 Surface3DController::Surface3DController(QRect rect, Q3DScene *scene)
     : Abstract3DController(rect, scene),
@@ -531,4 +521,4 @@ void Surface3DController::adjustValueAxisRange()
     }
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h
index 22635b73..85a32564 100644
--- a/src/datavisualization/engine/surface3dcontroller_p.h
+++ b/src/datavisualization/engine/surface3dcontroller_p.h
@@ -33,7 +33,7 @@
 #include "datavisualizationglobal_p.h"
 
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Surface3DRenderer;
 class QSurface3DSeries;
@@ -109,6 +109,6 @@ private:
     Q_DISABLE_COPY(Surface3DController)
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
-#endif // SURFACE3DCONTROLLER_P_H
+#endif