Reintroduced namespace macros

Task-number: QTRD-2594

Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b
Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

9 files changed, 24 insertions, 39 deletions

diff --git a/src/datavisualization/axis/qabstract3daxis.cpp b/src/datavisualization/axis/qabstract3daxis.cpp
index 99a4a91d..20e7f361 100644
--- a/src/datavisualization/axis/qabstract3daxis.cpp
+++ b/src/datavisualization/axis/qabstract3daxis.cpp
@@ -19,10 +19,10 @@
 #include "qabstract3daxis.h"
 #include "qabstract3daxis_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::QAbstract3DAxis
+ * \class QAbstract3DAxis
  * \inmodule QtDataVisualization
  * \brief QAbstract3DAxis is base class for axes of a graph.
  * \since Qt Data Visualization 1.0
@@ -37,7 +37,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QAbstract3DAxis
+ * \instantiates QAbstract3DAxis
  * \brief AbstractAxis3D is base type for axes of a graph.
  *
  * This type is uncreatable, but contains properties that are exposed via subtypes.
@@ -255,11 +255,6 @@ bool QAbstract3DAxis::isAutoAdjustRange() const
  */
 
 // QAbstract3DAxisPrivate
-/*!
- * \class QtDataVisualization::QAbstract3DAxisPrivate
- * \internal
- */
-
 QAbstract3DAxisPrivate::QAbstract3DAxisPrivate(QAbstract3DAxis *q, QAbstract3DAxis::AxisType type)
     : QObject(0),
       q_ptr(q),
@@ -405,4 +400,4 @@ void QAbstract3DAxisPrivate::setMax(float max)
     }
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h
index c85e50d0..c4cb37b2 100644
--- a/src/datavisualization/axis/qabstract3daxis.h
+++ b/src/datavisualization/axis/qabstract3daxis.h
@@ -26,7 +26,7 @@
 #include <QVector>
 #include <QStringList>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QAbstract3DAxisPrivate;
 
@@ -103,6 +103,6 @@ private:
     friend class Bars3DController;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/axis/qabstract3daxis_p.h b/src/datavisualization/axis/qabstract3daxis_p.h
index 4403cc16..cca31fa4 100644
--- a/src/datavisualization/axis/qabstract3daxis_p.h
+++ b/src/datavisualization/axis/qabstract3daxis_p.h
@@ -33,7 +33,7 @@
 #ifndef QABSTRACT3DAXIS_P_H
 #define QABSTRACT3DAXIS_P_H
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QAbstract3DAxisPrivate : public QObject
 {
@@ -72,6 +72,6 @@ protected:
     friend class QCategory3DAxis;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/axis/qcategory3daxis.cpp b/src/datavisualization/axis/qcategory3daxis.cpp
index a29fb376..0ef59b59 100644
--- a/src/datavisualization/axis/qcategory3daxis.cpp
+++ b/src/datavisualization/axis/qcategory3daxis.cpp
@@ -21,10 +21,10 @@
 #include "bars3dcontroller_p.h"
 #include "qbardataproxy.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::QCategory3DAxis
+ * \class QCategory3DAxis
  * \inmodule QtDataVisualization
  * \brief The QCategory3DAxis class is used for manipulating an axis of a graph.
  * \since Qt Data Visualization 1.0
@@ -41,7 +41,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QCategory3DAxis
+ * \instantiates QCategory3DAxis
  * \inherits AbstractAxis3D
  * \brief The CategoryAxis3D type is used for manipulating an axis of a graph.
  *
@@ -117,11 +117,6 @@ QCategory3DAxisPrivate *QCategory3DAxis::dptr()
     return static_cast<QCategory3DAxisPrivate *>(d_ptr.data());
 }
 
-/*!
- * \class QtDataVisualization::QCategory3DAxisPrivate
- * \internal
- */
-
 QCategory3DAxisPrivate::QCategory3DAxisPrivate(QCategory3DAxis *q)
     : QAbstract3DAxisPrivate(q, QAbstract3DAxis::AxisTypeCategory),
       m_labelsExplicitlySet(false)
@@ -152,4 +147,4 @@ QCategory3DAxis *QCategory3DAxisPrivate::qptr()
     return static_cast<QCategory3DAxis *>(q_ptr);
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/axis/qcategory3daxis.h b/src/datavisualization/axis/qcategory3daxis.h
index 2d3235b4..d16eac2a 100644
--- a/src/datavisualization/axis/qcategory3daxis.h
+++ b/src/datavisualization/axis/qcategory3daxis.h
@@ -21,7 +21,7 @@
 
 #include <QtDataVisualization/qabstract3daxis.h>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QCategory3DAxisPrivate;
 
@@ -48,6 +48,6 @@ private:
     friend class Bars3DController;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/axis/qcategory3daxis_p.h b/src/datavisualization/axis/qcategory3daxis_p.h
index 6449e999..f7a16161 100644
--- a/src/datavisualization/axis/qcategory3daxis_p.h
+++ b/src/datavisualization/axis/qcategory3daxis_p.h
@@ -33,7 +33,7 @@
 #ifndef QCATEGORY3DAXIS_P_H
 #define QCATEGORY3DAXIS_P_H
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QCategory3DAxisPrivate : public QAbstract3DAxisPrivate
 {
@@ -52,6 +52,6 @@ private:
     friend class QCategory3DAxis;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/axis/qvalue3daxis.cpp b/src/datavisualization/axis/qvalue3daxis.cpp
index deee9bac..609e3b86 100644
--- a/src/datavisualization/axis/qvalue3daxis.cpp
+++ b/src/datavisualization/axis/qvalue3daxis.cpp
@@ -20,10 +20,10 @@
 #include "qvalue3daxis_p.h"
 #include "utils_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::QValue3DAxis
+ * \class QValue3DAxis
  * \inmodule QtDataVisualization
  * \brief The QValue3DAxis class is used for manipulating an axis of a graph.
  * \since Qt Data Visualization 1.0
@@ -41,7 +41,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QValue3DAxis
+ * \instantiates QValue3DAxis
  * \inherits AbstractAxis3D
  * \brief The ValueAxis3D type is used for manipulating an axis of a graph.
  *
@@ -184,11 +184,6 @@ const QValue3DAxisPrivate *QValue3DAxis::dptrc() const
     return static_cast<const QValue3DAxisPrivate *>(d_ptr.data());
 }
 
-/*!
- * \class QtDataVisualization::QValue3DAxisPrivate
- * \internal
- */
-
 QValue3DAxisPrivate::QValue3DAxisPrivate(QValue3DAxis *q)
     : QAbstract3DAxisPrivate(q, QAbstract3DAxis::AxisTypeValue),
       m_segmentCount(5),
@@ -272,4 +267,4 @@ QValue3DAxis *QValue3DAxisPrivate::qptr()
     return static_cast<QValue3DAxis *>(q_ptr);
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h
index c842167c..d5d23825 100644
--- a/src/datavisualization/axis/qvalue3daxis.h
+++ b/src/datavisualization/axis/qvalue3daxis.h
@@ -21,7 +21,7 @@
 
 #include <QtDataVisualization/qabstract3daxis.h>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QValue3DAxisPrivate;
 
@@ -60,6 +60,6 @@ private:
     friend class Surface3DController;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualization/axis/qvalue3daxis_p.h b/src/datavisualization/axis/qvalue3daxis_p.h
index 08dab486..b1b65fd7 100644
--- a/src/datavisualization/axis/qvalue3daxis_p.h
+++ b/src/datavisualization/axis/qvalue3daxis_p.h
@@ -32,7 +32,7 @@
 #ifndef QVALUE3DAXIS_P_H
 #define QVALUE3DAXIS_P_H
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QValue3DAxisPrivate : public QAbstract3DAxisPrivate
 {
@@ -61,6 +61,6 @@ private:
     friend class QValue3DAxis;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif