From 587d44e8077196ed4aa3df1484e69adcba2dc268 Mon Sep 17 00:00:00 2001
From: Tomi Korpipaa <tomi.korpipaa@qt.io>
Date: Thu, 28 Jan 2021 12:16:28 +0200
Subject: Remove custom namespace

Fixes: QTBUG-90400
Change-Id: Ia2f1974a21112bad97724717d073d367c4413a7f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 src/datavisualization/data/abstractitemmodelhandler.cpp   | 4 ++--
 src/datavisualization/data/abstractitemmodelhandler_p.h   | 4 ++--
 src/datavisualization/data/abstractrenderitem.cpp         | 4 ++--
 src/datavisualization/data/abstractrenderitem_p.h         | 4 ++--
 src/datavisualization/data/baritemmodelhandler.cpp        | 4 ++--
 src/datavisualization/data/baritemmodelhandler_p.h        | 4 ++--
 src/datavisualization/data/barrenderitem.cpp              | 4 ++--
 src/datavisualization/data/barrenderitem_p.h              | 4 ++--
 src/datavisualization/data/customrenderitem.cpp           | 4 ++--
 src/datavisualization/data/customrenderitem_p.h           | 4 ++--
 src/datavisualization/data/labelitem.cpp                  | 4 ++--
 src/datavisualization/data/labelitem_p.h                  | 4 ++--
 src/datavisualization/data/qabstract3dseries.cpp          | 4 ++--
 src/datavisualization/data/qabstract3dseries.h            | 6 +++---
 src/datavisualization/data/qabstract3dseries_p.h          | 4 ++--
 src/datavisualization/data/qabstractdataproxy.cpp         | 4 ++--
 src/datavisualization/data/qabstractdataproxy.h           | 4 ++--
 src/datavisualization/data/qabstractdataproxy_p.h         | 4 ++--
 src/datavisualization/data/qbar3dseries.cpp               | 4 ++--
 src/datavisualization/data/qbar3dseries.h                 | 4 ++--
 src/datavisualization/data/qbar3dseries_p.h               | 4 ++--
 src/datavisualization/data/qbardataitem.cpp               | 4 ++--
 src/datavisualization/data/qbardataitem.h                 | 4 ++--
 src/datavisualization/data/qbardataitem_p.h               | 4 ++--
 src/datavisualization/data/qbardataproxy.cpp              | 4 ++--
 src/datavisualization/data/qbardataproxy.h                | 4 ++--
 src/datavisualization/data/qbardataproxy_p.h              | 4 ++--
 src/datavisualization/data/qcustom3ditem.cpp              | 4 ++--
 src/datavisualization/data/qcustom3ditem.h                | 4 ++--
 src/datavisualization/data/qcustom3ditem_p.h              | 4 ++--
 src/datavisualization/data/qcustom3dlabel.cpp             | 4 ++--
 src/datavisualization/data/qcustom3dlabel.h               | 4 ++--
 src/datavisualization/data/qcustom3dlabel_p.h             | 4 ++--
 src/datavisualization/data/qcustom3dvolume.cpp            | 4 ++--
 src/datavisualization/data/qcustom3dvolume.h              | 4 ++--
 src/datavisualization/data/qcustom3dvolume_p.h            | 4 ++--
 src/datavisualization/data/qheightmapsurfacedataproxy.cpp | 4 ++--
 src/datavisualization/data/qheightmapsurfacedataproxy.h   | 4 ++--
 src/datavisualization/data/qheightmapsurfacedataproxy_p.h | 4 ++--
 src/datavisualization/data/qitemmodelbardataproxy.cpp     | 4 ++--
 src/datavisualization/data/qitemmodelbardataproxy.h       | 4 ++--
 src/datavisualization/data/qitemmodelbardataproxy_p.h     | 4 ++--
 src/datavisualization/data/qitemmodelscatterdataproxy.cpp | 4 ++--
 src/datavisualization/data/qitemmodelscatterdataproxy.h   | 4 ++--
 src/datavisualization/data/qitemmodelscatterdataproxy_p.h | 4 ++--
 src/datavisualization/data/qitemmodelsurfacedataproxy.cpp | 4 ++--
 src/datavisualization/data/qitemmodelsurfacedataproxy.h   | 4 ++--
 src/datavisualization/data/qitemmodelsurfacedataproxy_p.h | 4 ++--
 src/datavisualization/data/qscatter3dseries.cpp           | 4 ++--
 src/datavisualization/data/qscatter3dseries.h             | 4 ++--
 src/datavisualization/data/qscatter3dseries_p.h           | 4 ++--
 src/datavisualization/data/qscatterdataitem.cpp           | 4 ++--
 src/datavisualization/data/qscatterdataitem.h             | 4 ++--
 src/datavisualization/data/qscatterdataitem_p.h           | 4 ++--
 src/datavisualization/data/qscatterdataproxy.cpp          | 4 ++--
 src/datavisualization/data/qscatterdataproxy.h            | 4 ++--
 src/datavisualization/data/qscatterdataproxy_p.h          | 4 ++--
 src/datavisualization/data/qsurface3dseries.cpp           | 4 ++--
 src/datavisualization/data/qsurface3dseries.h             | 4 ++--
 src/datavisualization/data/qsurface3dseries_p.h           | 4 ++--
 src/datavisualization/data/qsurfacedataitem.cpp           | 4 ++--
 src/datavisualization/data/qsurfacedataitem.h             | 4 ++--
 src/datavisualization/data/qsurfacedataitem_p.h           | 4 ++--
 src/datavisualization/data/qsurfacedataproxy.cpp          | 4 ++--
 src/datavisualization/data/qsurfacedataproxy.h            | 4 ++--
 src/datavisualization/data/qsurfacedataproxy_p.h          | 4 ++--
 src/datavisualization/data/scatteritemmodelhandler.cpp    | 4 ++--
 src/datavisualization/data/scatteritemmodelhandler_p.h    | 4 ++--
 src/datavisualization/data/scatterrenderitem.cpp          | 4 ++--
 src/datavisualization/data/scatterrenderitem_p.h          | 4 ++--
 src/datavisualization/data/surfaceitemmodelhandler.cpp    | 4 ++--
 src/datavisualization/data/surfaceitemmodelhandler_p.h    | 4 ++--
 72 files changed, 145 insertions(+), 145 deletions(-)

(limited to 'src/datavisualization/data')

diff --git a/src/datavisualization/data/abstractitemmodelhandler.cpp b/src/datavisualization/data/abstractitemmodelhandler.cpp
index 703a337f..c8c5bf25 100644
--- a/src/datavisualization/data/abstractitemmodelhandler.cpp
+++ b/src/datavisualization/data/abstractitemmodelhandler.cpp
@@ -29,7 +29,7 @@
 
 #include "abstractitemmodelhandler_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 AbstractItemModelHandler::AbstractItemModelHandler(QObject *parent)
     : QObject(parent),
@@ -237,4 +237,4 @@ void AbstractItemModelHandler::handlePendingResolve()
     m_fullReset = false;
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h
index 62a78103..fb215244 100644
--- a/src/datavisualization/data/abstractitemmodelhandler_p.h
+++ b/src/datavisualization/data/abstractitemmodelhandler_p.h
@@ -45,7 +45,7 @@
 #include <QtCore/QPointer>
 #include <QtCore/QTimer>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class AbstractItemModelHandler : public QObject
 {
@@ -91,6 +91,6 @@ private:
     Q_DISABLE_COPY(AbstractItemModelHandler)
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/abstractrenderitem.cpp b/src/datavisualization/data/abstractrenderitem.cpp
index 8a932e3f..25b656b6 100644
--- a/src/datavisualization/data/abstractrenderitem.cpp
+++ b/src/datavisualization/data/abstractrenderitem.cpp
@@ -29,7 +29,7 @@
 
 #include "abstractrenderitem_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 AbstractRenderItem::AbstractRenderItem()
 {
@@ -45,4 +45,4 @@ AbstractRenderItem::~AbstractRenderItem()
 {
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/abstractrenderitem_p.h b/src/datavisualization/data/abstractrenderitem_p.h
index 28755d61..3c413a7b 100644
--- a/src/datavisualization/data/abstractrenderitem_p.h
+++ b/src/datavisualization/data/abstractrenderitem_p.h
@@ -46,7 +46,7 @@
 #include <QtGui/QVector3D>
 #include <QtGui/QQuaternion>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class AbstractRenderItem
 {
@@ -75,6 +75,6 @@ protected:
     friend class QAbstractDataItem;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp
index c09e97c9..8864948a 100644
--- a/src/datavisualization/data/baritemmodelhandler.cpp
+++ b/src/datavisualization/data/baritemmodelhandler.cpp
@@ -29,7 +29,7 @@
 
 #include "baritemmodelhandler_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 static const int noRoleIndex = -1;
 
@@ -299,4 +299,4 @@ void BarItemModelHandler::resolveModel()
     m_proxy->resetArray(m_proxyArray, rowLabels, columnLabels);
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/baritemmodelhandler_p.h b/src/datavisualization/data/baritemmodelhandler_p.h
index 0363ad05..dbb95967 100644
--- a/src/datavisualization/data/baritemmodelhandler_p.h
+++ b/src/datavisualization/data/baritemmodelhandler_p.h
@@ -43,7 +43,7 @@
 #include "abstractitemmodelhandler_p.h"
 #include "qitemmodelbardataproxy_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class BarItemModelHandler : public AbstractItemModelHandler
 {
@@ -72,6 +72,6 @@ protected:
     bool m_haveRotationPattern;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/barrenderitem.cpp b/src/datavisualization/data/barrenderitem.cpp
index 23e3f13c..3fa423d9 100644
--- a/src/datavisualization/data/barrenderitem.cpp
+++ b/src/datavisualization/data/barrenderitem.cpp
@@ -29,7 +29,7 @@
 
 #include "barrenderitem_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 BarRenderItem::BarRenderItem()
     : AbstractRenderItem(),
@@ -99,4 +99,4 @@ const QString &BarRenderSliceItem::sliceLabel() const
     return m_sliceLabel;
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/barrenderitem_p.h b/src/datavisualization/data/barrenderitem_p.h
index 29147722..b336f087 100644
--- a/src/datavisualization/data/barrenderitem_p.h
+++ b/src/datavisualization/data/barrenderitem_p.h
@@ -42,7 +42,7 @@
 
 #include "abstractrenderitem_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class BarRenderItem : public AbstractRenderItem
 {
@@ -96,6 +96,6 @@ protected:
 typedef QList<BarRenderItem> BarRenderItemRow;
 typedef QList<BarRenderItemRow> BarRenderItemArray;
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/customrenderitem.cpp b/src/datavisualization/data/customrenderitem.cpp
index ac998fba..68e84c44 100644
--- a/src/datavisualization/data/customrenderitem.cpp
+++ b/src/datavisualization/data/customrenderitem.cpp
@@ -29,7 +29,7 @@
 
 #include "customrenderitem_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 CustomRenderItem::CustomRenderItem()
     : AbstractRenderItem(),
@@ -116,4 +116,4 @@ void CustomRenderItem::setSliceFrameColor(const QColor &color)
                                   float(1.0f)); // Alpha not supported for frames
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/customrenderitem_p.h b/src/datavisualization/data/customrenderitem_p.h
index 3ee423cb..196e6aa0 100644
--- a/src/datavisualization/data/customrenderitem_p.h
+++ b/src/datavisualization/data/customrenderitem_p.h
@@ -46,7 +46,7 @@
 #include <QtGui/QImage>
 #include <QtGui/QColor>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QCustom3DItem;
 class Abstract3DRenderer;
@@ -198,6 +198,6 @@ private:
 };
 typedef QHash<QCustom3DItem *, CustomRenderItem *> CustomRenderItemArray;
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/labelitem.cpp b/src/datavisualization/data/labelitem.cpp
index 9fa2e6b5..337c8008 100644
--- a/src/datavisualization/data/labelitem.cpp
+++ b/src/datavisualization/data/labelitem.cpp
@@ -29,7 +29,7 @@
 
 #include "labelitem_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 LabelItem::LabelItem()
     : m_size(QSize(0, 0)),
@@ -71,4 +71,4 @@ void LabelItem::clear()
     m_size = QSize(0, 0);
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/labelitem_p.h b/src/datavisualization/data/labelitem_p.h
index 788dffde..3b634496 100644
--- a/src/datavisualization/data/labelitem_p.h
+++ b/src/datavisualization/data/labelitem_p.h
@@ -43,7 +43,7 @@
 #include "datavisualizationglobal_p.h"
 #include <QtCore/QSize>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class LabelItem
 {
@@ -64,6 +64,6 @@ private:
     GLuint m_textureId;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qabstract3dseries.cpp b/src/datavisualization/data/qabstract3dseries.cpp
index 42579f62..a196ed66 100644
--- a/src/datavisualization/data/qabstract3dseries.cpp
+++ b/src/datavisualization/data/qabstract3dseries.cpp
@@ -31,7 +31,7 @@
 #include "qabstractdataproxy_p.h"
 #include "abstract3dcontroller_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QAbstract3DSeries
@@ -903,4 +903,4 @@ void QAbstract3DSeriesPrivate::setItemLabelVisible(bool visible)
     m_changeTracker.itemLabelVisibilityChanged = true;
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h
index 80cb52c3..3114639f 100644
--- a/src/datavisualization/data/qabstract3dseries.h
+++ b/src/datavisualization/data/qabstract3dseries.h
@@ -37,7 +37,7 @@
 #include <QtGui/QLinearGradient>
 #include <QtGui/QQuaternion>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QAbstract3DSeriesPrivate;
 
@@ -53,7 +53,7 @@ class QT_DATAVISUALIZATION_EXPORT QAbstract3DSeries : public QObject
     Q_PROPERTY(bool meshSmooth READ isMeshSmooth WRITE setMeshSmooth NOTIFY meshSmoothChanged)
     Q_PROPERTY(QQuaternion meshRotation READ meshRotation WRITE setMeshRotation NOTIFY meshRotationChanged)
     Q_PROPERTY(QString userDefinedMesh READ userDefinedMesh WRITE setUserDefinedMesh NOTIFY userDefinedMeshChanged)
-    Q_PROPERTY(QtDataVisualization::Q3DTheme::ColorStyle colorStyle READ colorStyle WRITE setColorStyle NOTIFY colorStyleChanged)
+    Q_PROPERTY(Q3DTheme::ColorStyle colorStyle READ colorStyle WRITE setColorStyle NOTIFY colorStyleChanged)
     Q_PROPERTY(QColor baseColor READ baseColor WRITE setBaseColor NOTIFY baseColorChanged)
     Q_PROPERTY(QLinearGradient baseGradient READ baseGradient WRITE setBaseGradient NOTIFY baseGradientChanged)
     Q_PROPERTY(QColor singleHighlightColor READ singleHighlightColor WRITE setSingleHighlightColor NOTIFY singleHighlightColorChanged)
@@ -171,6 +171,6 @@ private:
     friend class Abstract3DRenderer;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qabstract3dseries_p.h b/src/datavisualization/data/qabstract3dseries_p.h
index 0762386f..d4ad11c9 100644
--- a/src/datavisualization/data/qabstract3dseries_p.h
+++ b/src/datavisualization/data/qabstract3dseries_p.h
@@ -43,7 +43,7 @@
 #include "datavisualizationglobal_p.h"
 #include "qabstract3dseries.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QAbstractDataProxy;
 class Abstract3DController;
@@ -168,6 +168,6 @@ public:
     bool m_itemLabelVisible;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qabstractdataproxy.cpp b/src/datavisualization/data/qabstractdataproxy.cpp
index a9703e02..248b9f4a 100644
--- a/src/datavisualization/data/qabstractdataproxy.cpp
+++ b/src/datavisualization/data/qabstractdataproxy.cpp
@@ -30,7 +30,7 @@
 #include "qabstractdataproxy_p.h"
 #include "qabstract3dseries_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QAbstractDataProxy
@@ -126,4 +126,4 @@ void QAbstractDataProxyPrivate::setSeries(QAbstract3DSeries *series)
     m_series = series;
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h
index d0260684..89d73bce 100644
--- a/src/datavisualization/data/qabstractdataproxy.h
+++ b/src/datavisualization/data/qabstractdataproxy.h
@@ -34,7 +34,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QAbstractDataProxyPrivate;
 
@@ -69,6 +69,6 @@ private:
     friend class QAbstract3DSeriesPrivate;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qabstractdataproxy_p.h b/src/datavisualization/data/qabstractdataproxy_p.h
index abe1f4ce..6ab33661 100644
--- a/src/datavisualization/data/qabstractdataproxy_p.h
+++ b/src/datavisualization/data/qabstractdataproxy_p.h
@@ -43,7 +43,7 @@
 #include "datavisualizationglobal_p.h"
 #include "qabstractdataproxy.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QAbstract3DSeries;
 
@@ -66,6 +66,6 @@ private:
     friend class QAbstractDataProxy;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp
index 54b973e8..afc3b3ba 100644
--- a/src/datavisualization/data/qbar3dseries.cpp
+++ b/src/datavisualization/data/qbar3dseries.cpp
@@ -31,7 +31,7 @@
 #include "bars3dcontroller_p.h"
 #include <QtCore/qmath.h>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QBar3DSeries
@@ -432,4 +432,4 @@ void QBar3DSeriesPrivate::connectSignals()
                      &QBar3DSeriesPrivate::handleMeshRotationChanged);
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h
index 07a98ad5..c3a71205 100644
--- a/src/datavisualization/data/qbar3dseries.h
+++ b/src/datavisualization/data/qbar3dseries.h
@@ -34,7 +34,7 @@
 #include <QtDataVisualization/qbardataproxy.h>
 #include <QtCore/QPoint>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QBar3DSeriesPrivate;
 
@@ -75,6 +75,6 @@ private:
     friend class Bars3DController;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qbar3dseries_p.h b/src/datavisualization/data/qbar3dseries_p.h
index 0c8f5eb9..0f5bb43a 100644
--- a/src/datavisualization/data/qbar3dseries_p.h
+++ b/src/datavisualization/data/qbar3dseries_p.h
@@ -43,7 +43,7 @@
 #include "qbar3dseries.h"
 #include "qabstract3dseries_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QBar3DSeriesPrivate : public QAbstract3DSeriesPrivate
 {
@@ -71,6 +71,6 @@ private:
     friend class QBar3DSeries;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qbardataitem.cpp b/src/datavisualization/data/qbardataitem.cpp
index 5827cf42..e1a04c83 100644
--- a/src/datavisualization/data/qbardataitem.cpp
+++ b/src/datavisualization/data/qbardataitem.cpp
@@ -29,7 +29,7 @@
 
 #include "qbardataitem_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QBarDataItem
@@ -140,4 +140,4 @@ QBarDataItemPrivate::~QBarDataItemPrivate()
 {
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qbardataitem.h b/src/datavisualization/data/qbardataitem.h
index a8eef517..11a8e471 100644
--- a/src/datavisualization/data/qbardataitem.h
+++ b/src/datavisualization/data/qbardataitem.h
@@ -32,7 +32,7 @@
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QBarDataItemPrivate;
 
@@ -62,6 +62,6 @@ private:
     float m_angle;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qbardataitem_p.h b/src/datavisualization/data/qbardataitem_p.h
index 11dad9bf..000bafdb 100644
--- a/src/datavisualization/data/qbardataitem_p.h
+++ b/src/datavisualization/data/qbardataitem_p.h
@@ -43,7 +43,7 @@
 #include "datavisualizationglobal_p.h"
 #include "qbardataitem.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QBarDataItemPrivate
 {
@@ -52,6 +52,6 @@ public:
     virtual ~QBarDataItemPrivate();
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp
index c5d33535..36832137 100644
--- a/src/datavisualization/data/qbardataproxy.cpp
+++ b/src/datavisualization/data/qbardataproxy.cpp
@@ -30,7 +30,7 @@
 #include "qbardataproxy_p.h"
 #include "qbar3dseries_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QBarDataProxy
@@ -787,4 +787,4 @@ void QBarDataProxyPrivate::setSeries(QAbstract3DSeries *series)
     emit qptr()->seriesChanged(barSeries);
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index 155e5794..80e5f063 100644
--- a/src/datavisualization/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -37,7 +37,7 @@
 
 Q_MOC_INCLUDE(<QtDataVisualization/qbar3dseries.h>)
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QBarDataProxyPrivate;
 class QBar3DSeries;
@@ -119,6 +119,6 @@ private:
     friend class Bars3DController;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qbardataproxy_p.h b/src/datavisualization/data/qbardataproxy_p.h
index f3ed2098..7b2cf22b 100644
--- a/src/datavisualization/data/qbardataproxy_p.h
+++ b/src/datavisualization/data/qbardataproxy_p.h
@@ -43,7 +43,7 @@
 #include "qbardataproxy.h"
 #include "qabstractdataproxy_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QBarDataProxyPrivate : public QAbstractDataProxyPrivate
 {
@@ -82,6 +82,6 @@ private:
     friend class QBarDataProxy;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qcustom3ditem.cpp b/src/datavisualization/data/qcustom3ditem.cpp
index 11df7750..07e3c809 100644
--- a/src/datavisualization/data/qcustom3ditem.cpp
+++ b/src/datavisualization/data/qcustom3ditem.cpp
@@ -29,7 +29,7 @@
 
 #include "qcustom3ditem_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QCustom3DItem
@@ -537,4 +537,4 @@ void QCustom3DItemPrivate::resetDirtyBits()
     m_dirtyBits.shadowCastingDirty = false;
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qcustom3ditem.h b/src/datavisualization/data/qcustom3ditem.h
index 0fbc1926..d16bd377 100644
--- a/src/datavisualization/data/qcustom3ditem.h
+++ b/src/datavisualization/data/qcustom3ditem.h
@@ -35,7 +35,7 @@
 #include <QtGui/QVector3D>
 #include <QtGui/QQuaternion>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QCustom3DItemPrivate;
 
@@ -113,6 +113,6 @@ private:
     friend class Abstract3DController;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qcustom3ditem_p.h b/src/datavisualization/data/qcustom3ditem_p.h
index d99db35a..d97c98c4 100644
--- a/src/datavisualization/data/qcustom3ditem_p.h
+++ b/src/datavisualization/data/qcustom3ditem_p.h
@@ -43,7 +43,7 @@
 #include "datavisualizationglobal_p.h"
 #include "qcustom3ditem.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 struct QCustomItemDirtyBitField {
     bool textureDirty               : 1;
@@ -106,6 +106,6 @@ private:
     friend class QCustom3DItem;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qcustom3dlabel.cpp b/src/datavisualization/data/qcustom3dlabel.cpp
index 5cc0a0e4..72379dd8 100644
--- a/src/datavisualization/data/qcustom3dlabel.cpp
+++ b/src/datavisualization/data/qcustom3dlabel.cpp
@@ -30,7 +30,7 @@
 #include "qcustom3dlabel_p.h"
 #include "utils_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QCustom3DLabel
@@ -382,4 +382,4 @@ void QCustom3DLabelPrivate::handleTextureChange()
     }
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qcustom3dlabel.h b/src/datavisualization/data/qcustom3dlabel.h
index fdfcb9f9..9ca68fe9 100644
--- a/src/datavisualization/data/qcustom3dlabel.h
+++ b/src/datavisualization/data/qcustom3dlabel.h
@@ -37,7 +37,7 @@
 #include <QtGui/QFont>
 #include <QtGui/QColor>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QCustom3DLabelPrivate;
 
@@ -99,6 +99,6 @@ private:
     friend class Abstract3DRenderer;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qcustom3dlabel_p.h b/src/datavisualization/data/qcustom3dlabel_p.h
index c0608ec4..f607ac1b 100644
--- a/src/datavisualization/data/qcustom3dlabel_p.h
+++ b/src/datavisualization/data/qcustom3dlabel_p.h
@@ -43,7 +43,7 @@
 #include "qcustom3dlabel.h"
 #include "qcustom3ditem_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QCustom3DLabelPrivate : public QCustom3DItemPrivate
 {
@@ -79,6 +79,6 @@ private:
     friend class QCustom3DLabel;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qcustom3dvolume.cpp b/src/datavisualization/data/qcustom3dvolume.cpp
index 8f524c2b..df944a58 100644
--- a/src/datavisualization/data/qcustom3dvolume.cpp
+++ b/src/datavisualization/data/qcustom3dvolume.cpp
@@ -30,7 +30,7 @@
 #include "qcustom3dvolume_p.h"
 #include "utils_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QCustom3DVolume
@@ -1338,4 +1338,4 @@ QCustom3DVolume *QCustom3DVolumePrivate::qptr()
     return static_cast<QCustom3DVolume *>(q_ptr);
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qcustom3dvolume.h b/src/datavisualization/data/qcustom3dvolume.h
index 6967c608..886019d0 100644
--- a/src/datavisualization/data/qcustom3dvolume.h
+++ b/src/datavisualization/data/qcustom3dvolume.h
@@ -35,7 +35,7 @@
 #include <QtGui/QColor>
 #include <QtGui/QImage>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QCustom3DVolumePrivate;
 
@@ -154,6 +154,6 @@ private:
     friend class Abstract3DRenderer;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qcustom3dvolume_p.h b/src/datavisualization/data/qcustom3dvolume_p.h
index e12b706d..f68473a4 100644
--- a/src/datavisualization/data/qcustom3dvolume_p.h
+++ b/src/datavisualization/data/qcustom3dvolume_p.h
@@ -43,7 +43,7 @@
 #include "qcustom3dvolume.h"
 #include "qcustom3ditem_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 struct QCustomVolumeDirtyBitField {
     bool textureDimensionsDirty : 1;
@@ -114,6 +114,6 @@ private:
     friend class QCustom3DVolume;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
index 1d762f88..fd4ffcbb 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
@@ -29,7 +29,7 @@
 
 #include "qheightmapsurfacedataproxy_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 // Default ranges correspond value axis defaults
 const float defaultMinValue = 0.0f;
@@ -594,4 +594,4 @@ void QHeightMapSurfaceDataProxyPrivate::handlePendingResolve()
     emit qptr()->heightMapChanged(m_heightMap);
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h
index 4d815851..f9f9a23c 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h
@@ -34,7 +34,7 @@
 #include <QtGui/QImage>
 #include <QtCore/QString>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QHeightMapSurfaceDataProxyPrivate;
 
@@ -89,6 +89,6 @@ private:
     friend class Surface3DController;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
index 12219dd3..7dc2f41d 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
@@ -44,7 +44,7 @@
 #include "qsurfacedataproxy_p.h"
 #include <QtCore/QTimer>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QHeightMapSurfaceDataProxyPrivate : public QSurfaceDataProxyPrivate
 {
@@ -75,6 +75,6 @@ private:
     friend class QHeightMapSurfaceDataProxy;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp
index d901b07d..c5e7c3c0 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp
@@ -30,7 +30,7 @@
 #include "qitemmodelbardataproxy_p.h"
 #include "baritemmodelhandler_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QItemModelBarDataProxy
@@ -959,4 +959,4 @@ void QItemModelBarDataProxyPrivate::connectItemModelHandler()
                      m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h
index 7ac5d64a..90f14f6b 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy.h
@@ -34,7 +34,7 @@
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QRegularExpression>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QItemModelBarDataProxyPrivate;
 
@@ -174,6 +174,6 @@ private:
     friend class BarItemModelHandler;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qitemmodelbardataproxy_p.h b/src/datavisualization/data/qitemmodelbardataproxy_p.h
index 7b9b691a..4cd6e79d 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy_p.h
@@ -43,7 +43,7 @@
 #include "qitemmodelbardataproxy.h"
 #include "qbardataproxy_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class BarItemModelHandler;
 
@@ -90,6 +90,6 @@ private:
     friend class QItemModelBarDataProxy;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
index a2c7e41a..c1ac496f 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
@@ -30,7 +30,7 @@
 #include "qitemmodelscatterdataproxy_p.h"
 #include "scatteritemmodelhandler_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QItemModelScatterDataProxy
@@ -647,4 +647,4 @@ void QItemModelScatterDataProxyPrivate::connectItemModelHandler()
                      m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index ae321b65..c0106e81 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h
@@ -35,7 +35,7 @@
 #include <QtCore/QString>
 #include <QtCore/QRegularExpression>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QItemModelScatterDataProxyPrivate;
 
@@ -126,6 +126,6 @@ private:
     friend class ScatterItemModelHandler;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
index cb433a30..dd957f0d 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
@@ -43,7 +43,7 @@
 #include "qitemmodelscatterdataproxy.h"
 #include "qscatterdataproxy_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class ScatterItemModelHandler;
 
@@ -79,6 +79,6 @@ private:
     friend class QItemModelScatterDataProxy;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
index 0fa50fb2..701f9cca 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
@@ -30,7 +30,7 @@
 #include "qitemmodelsurfacedataproxy_p.h"
 #include "surfaceitemmodelhandler_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QItemModelSurfaceDataProxy
@@ -1124,4 +1124,4 @@ void QItemModelSurfaceDataProxyPrivate::connectItemModelHandler()
                      m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged);
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
index 52af2d19..168d6bae 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
@@ -35,7 +35,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QRegularExpression>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QItemModelSurfaceDataProxyPrivate;
 
@@ -191,6 +191,6 @@ private:
     friend class SurfaceItemModelHandler;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
index 1c8380b6..dc9f96cb 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
@@ -43,7 +43,7 @@
 #include "qitemmodelsurfacedataproxy.h"
 #include "qsurfacedataproxy_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class SurfaceItemModelHandler;
 
@@ -93,6 +93,6 @@ private:
     friend class QItemModelSurfaceDataProxy;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qscatter3dseries.cpp b/src/datavisualization/data/qscatter3dseries.cpp
index 1557a6c3..ec84ee96 100644
--- a/src/datavisualization/data/qscatter3dseries.cpp
+++ b/src/datavisualization/data/qscatter3dseries.cpp
@@ -30,7 +30,7 @@
 #include "qscatter3dseries_p.h"
 #include "scatter3dcontroller_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QScatter3DSeries
@@ -392,4 +392,4 @@ void QScatter3DSeriesPrivate::setItemSize(float size)
         m_controller->markSeriesVisualsDirty();
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h
index 0a1f93e9..e94aed85 100644
--- a/src/datavisualization/data/qscatter3dseries.h
+++ b/src/datavisualization/data/qscatter3dseries.h
@@ -33,7 +33,7 @@
 #include <QtDataVisualization/qabstract3dseries.h>
 #include <QtDataVisualization/qscatterdataproxy.h>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QScatter3DSeriesPrivate;
 
@@ -75,6 +75,6 @@ private:
     friend class Scatter3DController;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qscatter3dseries_p.h b/src/datavisualization/data/qscatter3dseries_p.h
index fc2f3b39..16f20886 100644
--- a/src/datavisualization/data/qscatter3dseries_p.h
+++ b/src/datavisualization/data/qscatter3dseries_p.h
@@ -43,7 +43,7 @@
 #include "qscatter3dseries.h"
 #include "qabstract3dseries_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QScatter3DSeriesPrivate : public QAbstract3DSeriesPrivate
 {
@@ -68,6 +68,6 @@ private:
     friend class QScatter3DSeries;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qscatterdataitem.cpp b/src/datavisualization/data/qscatterdataitem.cpp
index 12ea47af..db06573b 100644
--- a/src/datavisualization/data/qscatterdataitem.cpp
+++ b/src/datavisualization/data/qscatterdataitem.cpp
@@ -29,7 +29,7 @@
 
 #include "qscatterdataitem_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QScatterDataItem
@@ -176,4 +176,4 @@ QScatterDataItemPrivate::~QScatterDataItemPrivate()
 {
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qscatterdataitem.h b/src/datavisualization/data/qscatterdataitem.h
index 94be3a48..6fe749d0 100644
--- a/src/datavisualization/data/qscatterdataitem.h
+++ b/src/datavisualization/data/qscatterdataitem.h
@@ -33,7 +33,7 @@
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtGui/QQuaternion>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QScatterDataItemPrivate;
 
@@ -69,6 +69,6 @@ private:
     QQuaternion m_rotation;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qscatterdataitem_p.h b/src/datavisualization/data/qscatterdataitem_p.h
index 7eac8950..4fcfa58a 100644
--- a/src/datavisualization/data/qscatterdataitem_p.h
+++ b/src/datavisualization/data/qscatterdataitem_p.h
@@ -43,7 +43,7 @@
 #include "datavisualizationglobal_p.h"
 #include "qscatterdataitem.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QScatterDataItemPrivate
 {
@@ -52,6 +52,6 @@ public:
     virtual ~QScatterDataItemPrivate();
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp
index 884d2da9..b6d1d0cc 100644
--- a/src/datavisualization/data/qscatterdataproxy.cpp
+++ b/src/datavisualization/data/qscatterdataproxy.cpp
@@ -31,7 +31,7 @@
 #include "qscatter3dseries_p.h"
 #include "qabstract3daxis_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QScatterDataProxy
@@ -451,4 +451,4 @@ QScatterDataProxy *QScatterDataProxyPrivate::qptr()
     return static_cast<QScatterDataProxy *>(q_ptr);
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h
index 0a2f73ba..790e37c3 100644
--- a/src/datavisualization/data/qscatterdataproxy.h
+++ b/src/datavisualization/data/qscatterdataproxy.h
@@ -35,7 +35,7 @@
 
 Q_MOC_INCLUDE(<QtDataVisualization/qscatter3dseries.h>)
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QScatterDataProxyPrivate;
 class QScatter3DSeries;
@@ -92,6 +92,6 @@ private:
     friend class Scatter3DController;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qscatterdataproxy_p.h b/src/datavisualization/data/qscatterdataproxy_p.h
index 38a3959a..17d967ff 100644
--- a/src/datavisualization/data/qscatterdataproxy_p.h
+++ b/src/datavisualization/data/qscatterdataproxy_p.h
@@ -44,7 +44,7 @@
 #include "qabstractdataproxy_p.h"
 #include "qscatterdataitem.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QAbstract3DAxis;
 
@@ -75,6 +75,6 @@ private:
     friend class QScatterDataProxy;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp
index 83d766bd..94241dbc 100644
--- a/src/datavisualization/data/qsurface3dseries.cpp
+++ b/src/datavisualization/data/qsurface3dseries.cpp
@@ -30,7 +30,7 @@
 #include "qsurface3dseries_p.h"
 #include "surface3dcontroller_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QSurface3DSeries
@@ -553,4 +553,4 @@ void QSurface3DSeriesPrivate::setTexture(const QImage &texture)
         static_cast<Surface3DController *>(m_controller)->updateSurfaceTexture(qptr());
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index b0b83ea3..eadc6622 100644
--- a/src/datavisualization/data/qsurface3dseries.h
+++ b/src/datavisualization/data/qsurface3dseries.h
@@ -33,7 +33,7 @@
 #include <QtDataVisualization/qabstract3dseries.h>
 #include <QtDataVisualization/qsurfacedataproxy.h>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QSurface3DSeriesPrivate;
 
@@ -101,6 +101,6 @@ private:
     friend class Surface3DController;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qsurface3dseries_p.h b/src/datavisualization/data/qsurface3dseries_p.h
index 33afdce5..16a8cb23 100644
--- a/src/datavisualization/data/qsurface3dseries_p.h
+++ b/src/datavisualization/data/qsurface3dseries_p.h
@@ -43,7 +43,7 @@
 #include "qsurface3dseries.h"
 #include "qabstract3dseries_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QSurface3DSeriesPrivate : public QAbstract3DSeriesPrivate
 {
@@ -74,6 +74,6 @@ private:
     friend class QSurface3DSeries;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qsurfacedataitem.cpp b/src/datavisualization/data/qsurfacedataitem.cpp
index a4aeb18d..b35713f7 100644
--- a/src/datavisualization/data/qsurfacedataitem.cpp
+++ b/src/datavisualization/data/qsurfacedataitem.cpp
@@ -29,7 +29,7 @@
 
 #include "qsurfacedataitem_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QSurfaceDataItem
@@ -150,4 +150,4 @@ QSurfaceDataItemPrivate::~QSurfaceDataItemPrivate()
 {
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qsurfacedataitem.h b/src/datavisualization/data/qsurfacedataitem.h
index c4d9f7c8..a4685e3d 100644
--- a/src/datavisualization/data/qsurfacedataitem.h
+++ b/src/datavisualization/data/qsurfacedataitem.h
@@ -33,7 +33,7 @@
 #include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QtGui/QVector3D>
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QSurfaceDataItemPrivate;
 
@@ -65,6 +65,6 @@ private:
     QVector3D m_position;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qsurfacedataitem_p.h b/src/datavisualization/data/qsurfacedataitem_p.h
index 18babd90..6a738f33 100644
--- a/src/datavisualization/data/qsurfacedataitem_p.h
+++ b/src/datavisualization/data/qsurfacedataitem_p.h
@@ -43,7 +43,7 @@
 #include "datavisualizationglobal_p.h"
 #include "qsurfacedataitem.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QSurfaceDataItemPrivate
 {
@@ -52,6 +52,6 @@ public:
     virtual ~QSurfaceDataItemPrivate();
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp
index 50514889..81bbcc63 100644
--- a/src/datavisualization/data/qsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qsurfacedataproxy.cpp
@@ -31,7 +31,7 @@
 #include "qsurface3dseries_p.h"
 #include "qabstract3daxis_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 /*!
  * \class QSurfaceDataProxy
@@ -634,4 +634,4 @@ void QSurfaceDataProxyPrivate::setSeries(QAbstract3DSeries *series)
     emit qptr()->seriesChanged(surfaceSeries);
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index 9f767ce2..0b652d97 100644
--- a/src/datavisualization/data/qsurfacedataproxy.h
+++ b/src/datavisualization/data/qsurfacedataproxy.h
@@ -35,7 +35,7 @@
 
 Q_MOC_INCLUDE(<QtDataVisualization/qsurface3dseries.h>)
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QSurfaceDataProxyPrivate;
 class QSurface3DSeries;
@@ -101,6 +101,6 @@ private:
     friend class Surface3DController;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/qsurfacedataproxy_p.h b/src/datavisualization/data/qsurfacedataproxy_p.h
index bd92c15c..2e772508 100644
--- a/src/datavisualization/data/qsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qsurfacedataproxy_p.h
@@ -43,7 +43,7 @@
 #include "qsurfacedataproxy.h"
 #include "qabstractdataproxy_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class QAbstract3DAxis;
 
@@ -80,6 +80,6 @@ private:
     friend class QSurfaceDataProxy;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp
index 7cbaa8de..4c51e04a 100644
--- a/src/datavisualization/data/scatteritemmodelhandler.cpp
+++ b/src/datavisualization/data/scatteritemmodelhandler.cpp
@@ -29,7 +29,7 @@
 
 #include "scatteritemmodelhandler_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 static const int noRoleIndex = -1;
 
@@ -241,4 +241,4 @@ void ScatterItemModelHandler::resolveModel()
     m_proxy->resetArray(m_proxyArray);
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/scatteritemmodelhandler_p.h b/src/datavisualization/data/scatteritemmodelhandler_p.h
index 41320d0c..e1a0b77b 100644
--- a/src/datavisualization/data/scatteritemmodelhandler_p.h
+++ b/src/datavisualization/data/scatteritemmodelhandler_p.h
@@ -43,7 +43,7 @@
 #include "abstractitemmodelhandler_p.h"
 #include "qitemmodelscatterdataproxy_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class ScatterItemModelHandler : public AbstractItemModelHandler
 {
@@ -84,6 +84,6 @@ private:
     bool m_haveRotationPattern;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/scatterrenderitem.cpp b/src/datavisualization/data/scatterrenderitem.cpp
index 61fb85dd..6fea125b 100644
--- a/src/datavisualization/data/scatterrenderitem.cpp
+++ b/src/datavisualization/data/scatterrenderitem.cpp
@@ -29,7 +29,7 @@
 
 #include "scatterrenderitem_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 ScatterRenderItem::ScatterRenderItem()
     : AbstractRenderItem(),
@@ -48,4 +48,4 @@ ScatterRenderItem::~ScatterRenderItem()
 {
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/scatterrenderitem_p.h b/src/datavisualization/data/scatterrenderitem_p.h
index 4c0c30a4..d36a01bf 100644
--- a/src/datavisualization/data/scatterrenderitem_p.h
+++ b/src/datavisualization/data/scatterrenderitem_p.h
@@ -42,7 +42,7 @@
 
 #include "abstractrenderitem_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class ScatterRenderItem : public AbstractRenderItem
 {
@@ -67,6 +67,6 @@ protected:
 };
 typedef QList<ScatterRenderItem> ScatterRenderItemArray;
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp
index 7121d38a..59bbd4b4 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler.cpp
+++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp
@@ -29,7 +29,7 @@
 
 #include "surfaceitemmodelhandler_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 static const int noRoleIndex = -1;
 
@@ -331,4 +331,4 @@ void SurfaceItemModelHandler::resolveModel()
     m_proxy->resetArray(m_proxyArray);
 }
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
diff --git a/src/datavisualization/data/surfaceitemmodelhandler_p.h b/src/datavisualization/data/surfaceitemmodelhandler_p.h
index 21dfb0eb..68ec1994 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler_p.h
+++ b/src/datavisualization/data/surfaceitemmodelhandler_p.h
@@ -43,7 +43,7 @@
 #include "abstractitemmodelhandler_p.h"
 #include "qitemmodelsurfacedataproxy_p.h"
 
-QT_BEGIN_NAMESPACE_DATAVISUALIZATION
+QT_BEGIN_NAMESPACE
 
 class SurfaceItemModelHandler : public AbstractItemModelHandler
 {
@@ -75,6 +75,6 @@ protected:
     bool m_haveZPosPattern;
 };
 
-QT_END_NAMESPACE_DATAVISUALIZATION
+QT_END_NAMESPACE
 
 #endif
-- 
cgit v1.2.3