Reintroduced namespace macros

Task-number: QTRD-2594

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

18 files changed, 36 insertions, 36 deletions

diff --git a/src/datavisualizationqml2/colorgradient.cpp b/src/datavisualizationqml2/colorgradient.cpp
index 11ce2a58..e9574aa0 100644
--- a/src/datavisualizationqml2/colorgradient.cpp
+++ b/src/datavisualizationqml2/colorgradient.cpp
@@ -18,7 +18,7 @@
 
 #include "colorgradient_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 ColorGradientStop::ColorGradientStop(QObject *parent)
     : QObject(parent)
@@ -74,4 +74,4 @@ void ColorGradient::doUpdate()
     emit updated();
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/colorgradient_p.h b/src/datavisualizationqml2/colorgradient_p.h
index f2fcae1f..25c3343d 100644
--- a/src/datavisualizationqml2/colorgradient_p.h
+++ b/src/datavisualizationqml2/colorgradient_p.h
@@ -33,7 +33,7 @@
 #include <QColor>
 #include <QQmlListProperty>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class ColorGradientStop : public QObject
 {
@@ -83,6 +83,6 @@ Q_SIGNALS:
     void updated();
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
index 28f08500..0ba0bb17 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
@@ -20,7 +20,7 @@
 
 #include <qqml.h>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 void QtDataVisualizationQml2Plugin::registerTypes(const char *uri)
 {
@@ -80,5 +80,5 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri)
     qmlRegisterType<DeclarativeSurface3DSeries>(uri, 1, 0, "Surface3DSeries");
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
index fc18a1b6..54ff1a86 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
@@ -92,7 +92,7 @@ QML_DECLARE_TYPE(DeclarativeTheme3D)
 
 QML_DECLARE_TYPE(QAbstract3DInputHandler)
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QtDataVisualizationQml2Plugin : public QQmlExtensionPlugin
 {
@@ -103,7 +103,7 @@ public:
     void registerTypes(const char *uri);
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // DATAVISUALIZATIONQML2_PLUGIN_H
 
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index 8634e91d..74d60138 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -21,7 +21,7 @@
 #include "qitemmodelbardataproxy.h"
 #include "declarativescene_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 DeclarativeBars::DeclarativeBars(QQuickItem *parent)
     : AbstractDeclarative(parent),
@@ -185,4 +185,4 @@ void DeclarativeBars::handleAxisZChanged(QAbstract3DAxis *axis)
     emit rowAxisChanged(static_cast<QCategory3DAxis *>(axis));
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h
index 9c89c5a2..43b619f1 100644
--- a/src/datavisualizationqml2/declarativebars_p.h
+++ b/src/datavisualizationqml2/declarativebars_p.h
@@ -43,7 +43,7 @@
 #include <QObject>
 #include <QQuickWindow>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class DeclarativeBars : public AbstractDeclarative
 {
@@ -108,6 +108,6 @@ private:
     Bars3DController *m_barsController;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualizationqml2/declarativecolor.cpp b/src/datavisualizationqml2/declarativecolor.cpp
index f0c9263f..1becec4f 100644
--- a/src/datavisualizationqml2/declarativecolor.cpp
+++ b/src/datavisualizationqml2/declarativecolor.cpp
@@ -18,7 +18,7 @@
 
 #include "declarativecolor_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 DeclarativeColor::DeclarativeColor(QObject *parent)
     : QObject(parent)
@@ -38,4 +38,4 @@ QColor DeclarativeColor::color() const
     return m_color;
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/declarativecolor_p.h b/src/datavisualizationqml2/declarativecolor_p.h
index 5aa062c8..d37fe340 100644
--- a/src/datavisualizationqml2/declarativecolor_p.h
+++ b/src/datavisualizationqml2/declarativecolor_p.h
@@ -32,7 +32,7 @@
 #include "datavisualizationglobal_p.h"
 #include <QColor>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class DeclarativeColor : public QObject
 {
@@ -52,6 +52,6 @@ private:
     QColor m_color;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index 035736fd..6c2bba35 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -20,7 +20,7 @@
 #include "qitemmodelscatterdataproxy.h"
 #include "declarativescene_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 DeclarativeScatter::DeclarativeScatter(QQuickItem *parent)
     : AbstractDeclarative(parent),
@@ -127,4 +127,4 @@ void DeclarativeScatter::handleAxisZChanged(QAbstract3DAxis *axis)
     emit axisZChanged(static_cast<QValue3DAxis *>(axis));
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h
index 79636963..357c346d 100644
--- a/src/datavisualizationqml2/declarativescatter_p.h
+++ b/src/datavisualizationqml2/declarativescatter_p.h
@@ -41,7 +41,7 @@
 #include <QQuickItem>
 #include <QObject>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class DeclarativeScatter : public AbstractDeclarative
 {
@@ -85,6 +85,6 @@ protected:
     Scatter3DController *m_scatterController;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualizationqml2/declarativescene.cpp b/src/datavisualizationqml2/declarativescene.cpp
index ab747f9c..ed029dd8 100644
--- a/src/datavisualizationqml2/declarativescene.cpp
+++ b/src/datavisualizationqml2/declarativescene.cpp
@@ -18,7 +18,7 @@
 
 #include "declarativescene_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 Declarative3DScene::Declarative3DScene(QObject *parent)
     : Q3DScene(parent)
@@ -46,4 +46,4 @@ QPoint Declarative3DScene::invalidSelectionPoint() const
     return Q3DScene::invalidSelectionPoint();
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/declarativescene_p.h b/src/datavisualizationqml2/declarativescene_p.h
index 0a80d67f..4465751d 100644
--- a/src/datavisualizationqml2/declarativescene_p.h
+++ b/src/datavisualizationqml2/declarativescene_p.h
@@ -32,7 +32,7 @@
 #include "datavisualizationglobal_p.h"
 #include "q3dscene.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Declarative3DScene : public Q3DScene
 {
@@ -55,6 +55,6 @@ signals:
     void selectionQueryPositionChanged(const QPointF position);
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualizationqml2/declarativeseries.cpp b/src/datavisualizationqml2/declarativeseries.cpp
index 388b3dd4..e852b506 100644
--- a/src/datavisualizationqml2/declarativeseries.cpp
+++ b/src/datavisualizationqml2/declarativeseries.cpp
@@ -22,7 +22,7 @@
 #include "qsurfacedataproxy.h"
 #include <QMetaMethod>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 static void setSeriesGradient(QAbstract3DSeries *series, const ColorGradient &gradient, GradientType type)
 {
@@ -348,4 +348,4 @@ void DeclarativeSurface3DSeries::handleMultiHighlightGradientUpdate()
         setSeriesGradient(this, *m_multiHighlightGradient, GradientTypeMulti);
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/declarativeseries_p.h b/src/datavisualizationqml2/declarativeseries_p.h
index c7e5efb9..6b40fcde 100644
--- a/src/datavisualizationqml2/declarativeseries_p.h
+++ b/src/datavisualizationqml2/declarativeseries_p.h
@@ -36,7 +36,7 @@
 #include "colorgradient_p.h"
 #include <QQmlListProperty>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 enum GradientType {
     GradientTypeBase,
@@ -185,6 +185,6 @@ private:
     ColorGradient *m_multiHighlightGradient; // Not owned
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp
index b8fe285d..64186293 100644
--- a/src/datavisualizationqml2/declarativesurface.cpp
+++ b/src/datavisualizationqml2/declarativesurface.cpp
@@ -21,7 +21,7 @@
 #include "qitemmodelsurfacedataproxy.h"
 #include "declarativescene_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 DeclarativeSurface::DeclarativeSurface(QQuickItem *parent)
     : AbstractDeclarative(parent),
@@ -128,4 +128,4 @@ void DeclarativeSurface::handleAxisZChanged(QAbstract3DAxis *axis)
     emit axisZChanged(static_cast<QValue3DAxis *>(axis));
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h
index 041d8506..46821a51 100644
--- a/src/datavisualizationqml2/declarativesurface_p.h
+++ b/src/datavisualizationqml2/declarativesurface_p.h
@@ -42,7 +42,7 @@
 #include <QObject>
 #include <QQuickWindow>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class DeclarativeSurface : public AbstractDeclarative
 {
@@ -86,6 +86,6 @@ private:
     Surface3DController *m_surfaceController;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif
diff --git a/src/datavisualizationqml2/declarativetheme.cpp b/src/datavisualizationqml2/declarativetheme.cpp
index e591f394..e64f156b 100644
--- a/src/datavisualizationqml2/declarativetheme.cpp
+++ b/src/datavisualizationqml2/declarativetheme.cpp
@@ -18,7 +18,7 @@
 
 #include "declarativetheme_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 DeclarativeTheme3D::DeclarativeTheme3D(QObject *parent)
     : Q3DTheme(parent),
@@ -390,4 +390,4 @@ void DeclarativeTheme3D::clearBaseGradientsFunc(QQmlListProperty<ColorGradient>
     reinterpret_cast<DeclarativeTheme3D *>(list->data)->clearGradients();
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h
index 8f527f2f..21a70f2c 100644
--- a/src/datavisualizationqml2/declarativetheme_p.h
+++ b/src/datavisualizationqml2/declarativetheme_p.h
@@ -36,7 +36,7 @@
 
 #include <QtQml/qqmlparserstatus.h>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class DeclarativeTheme3D : public Q3DTheme, public QQmlParserStatus
 {
@@ -121,6 +121,6 @@ private:
     bool m_dummyColors;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif