From 64d6b482bfb9dbacd548b72cb9c073513f6aa56f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Wed, 15 Jan 2014 11:34:59 +0200
Subject: Removed QDataVis and namespace macros

- docs will be fixed in QTRD-2594

Task-number: QTRD-2699
Task-number: QTRD-2700
Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
---
 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/labelitem.cpp                  | 4 ++--
 src/datavisualization/data/labelitem_p.h                  | 4 ++--
 src/datavisualization/data/qabstract3dseries.cpp          | 4 ++--
 src/datavisualization/data/qabstract3dseries.h            | 5 ++---
 src/datavisualization/data/qabstract3dseries_p.h          | 4 ++--
 src/datavisualization/data/qabstractdataproxy.cpp         | 4 ++--
 src/datavisualization/data/qabstractdataproxy.h           | 7 ++++---
 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                 | 6 ++----
 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/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             | 5 ++---
 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             | 6 +++---
 src/datavisualization/data/qsurface3dseries_p.h           | 4 ++--
 src/datavisualization/data/qsurfacedataitem.cpp           | 4 ++--
 src/datavisualization/data/qsurfacedataitem.h             | 5 ++---
 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 ++--
 61 files changed, 125 insertions(+), 129 deletions(-)

(limited to 'src/datavisualization/data')

diff --git a/src/datavisualization/data/abstractitemmodelhandler.cpp b/src/datavisualization/data/abstractitemmodelhandler.cpp
index 41f520a4..6cae79c8 100644
--- a/src/datavisualization/data/abstractitemmodelhandler.cpp
+++ b/src/datavisualization/data/abstractitemmodelhandler.cpp
@@ -19,7 +19,7 @@
 #include "abstractitemmodelhandler_p.h"
 #include <QTimer>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 AbstractItemModelHandler::AbstractItemModelHandler(QObject *parent)
     : QObject(parent),
@@ -196,4 +196,4 @@ void AbstractItemModelHandler::handlePendingResolve()
     resolveModel();
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h
index b4d55b4a..6771dcc8 100644
--- a/src/datavisualization/data/abstractitemmodelhandler_p.h
+++ b/src/datavisualization/data/abstractitemmodelhandler_p.h
@@ -34,7 +34,7 @@
 #include <QPointer>
 #include <QTimer>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class AbstractItemModelHandler : public QObject
 {
@@ -79,6 +79,6 @@ private:
     Q_DISABLE_COPY(AbstractItemModelHandler)
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/abstractrenderitem.cpp b/src/datavisualization/data/abstractrenderitem.cpp
index 22a1c6de..268c1e9b 100644
--- a/src/datavisualization/data/abstractrenderitem.cpp
+++ b/src/datavisualization/data/abstractrenderitem.cpp
@@ -18,7 +18,7 @@
 
 #include "abstractrenderitem_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 AbstractRenderItem::AbstractRenderItem()
     : m_selectionLabelItem(0)
@@ -57,4 +57,4 @@ QString &AbstractRenderItem::selectionLabel()
 }
 
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/abstractrenderitem_p.h b/src/datavisualization/data/abstractrenderitem_p.h
index ca71c0b0..15860933 100644
--- a/src/datavisualization/data/abstractrenderitem_p.h
+++ b/src/datavisualization/data/abstractrenderitem_p.h
@@ -37,7 +37,7 @@
 #include <QVector3D>
 #include <QQuaternion>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class AbstractRenderItem
 {
@@ -65,6 +65,6 @@ protected:
     friend class QAbstractDataItem;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp
index b67a3d8a..bd6f127b 100644
--- a/src/datavisualization/data/baritemmodelhandler.cpp
+++ b/src/datavisualization/data/baritemmodelhandler.cpp
@@ -18,7 +18,7 @@
 
 #include "baritemmodelhandler_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 BarItemModelHandler::BarItemModelHandler(QItemModelBarDataProxy *proxy, QObject *parent)
     : AbstractItemModelHandler(parent),
@@ -143,4 +143,4 @@ void BarItemModelHandler::resolveModel()
     m_proxy->resetArray(m_proxyArray, rowLabels, columnLabels);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/baritemmodelhandler_p.h b/src/datavisualization/data/baritemmodelhandler_p.h
index 99192b55..c977103e 100644
--- a/src/datavisualization/data/baritemmodelhandler_p.h
+++ b/src/datavisualization/data/baritemmodelhandler_p.h
@@ -32,7 +32,7 @@
 #include "abstractitemmodelhandler_p.h"
 #include "qitemmodelbardataproxy_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class BarItemModelHandler : public AbstractItemModelHandler
 {
@@ -49,6 +49,6 @@ protected:
     int m_columnCount;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/barrenderitem.cpp b/src/datavisualization/data/barrenderitem.cpp
index 67029c60..678d6ba0 100644
--- a/src/datavisualization/data/barrenderitem.cpp
+++ b/src/datavisualization/data/barrenderitem.cpp
@@ -19,7 +19,7 @@
 #include "barrenderitem_p.h"
 #include "bars3drenderer_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 BarRenderItem::BarRenderItem()
     : AbstractRenderItem(),
@@ -66,4 +66,4 @@ QString &BarRenderItem::sliceLabel()
 }
 
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/barrenderitem_p.h b/src/datavisualization/data/barrenderitem_p.h
index 480d5049..5a44e2fd 100644
--- a/src/datavisualization/data/barrenderitem_p.h
+++ b/src/datavisualization/data/barrenderitem_p.h
@@ -31,7 +31,7 @@
 
 #include "abstractrenderitem_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Bars3DRenderer;
 
@@ -90,6 +90,6 @@ void BarRenderItem::setValue(float value)
 typedef QVector<BarRenderItem> BarRenderItemRow;
 typedef QVector<BarRenderItemRow> BarRenderItemArray;
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/labelitem.cpp b/src/datavisualization/data/labelitem.cpp
index 5e27a50e..78e8d0f2 100644
--- a/src/datavisualization/data/labelitem.cpp
+++ b/src/datavisualization/data/labelitem.cpp
@@ -18,7 +18,7 @@
 
 #include "labelitem_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 LabelItem::LabelItem()
     : m_size(QSize(0, 0)),
@@ -61,4 +61,4 @@ void LabelItem::clear()
     m_size = QSize(0, 0);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/labelitem_p.h b/src/datavisualization/data/labelitem_p.h
index c10c1f12..40e1030a 100644
--- a/src/datavisualization/data/labelitem_p.h
+++ b/src/datavisualization/data/labelitem_p.h
@@ -33,7 +33,7 @@
 #include <QOpenGLFunctions>
 #include <QSize>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class LabelItem
 {
@@ -54,6 +54,6 @@ private:
     GLuint m_textureId;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qabstract3dseries.cpp b/src/datavisualization/data/qabstract3dseries.cpp
index 1afb63c4..577a04a9 100644
--- a/src/datavisualization/data/qabstract3dseries.cpp
+++ b/src/datavisualization/data/qabstract3dseries.cpp
@@ -21,7 +21,7 @@
 #include "qabstractdataproxy_p.h"
 #include "abstract3dcontroller_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QAbstract3DSeries
@@ -704,4 +704,4 @@ void QAbstract3DSeriesPrivate::resetToTheme(const Q3DTheme &theme, int seriesInd
     }
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h
index bbcf60ad..615d882e 100644
--- a/src/datavisualization/data/qabstract3dseries.h
+++ b/src/datavisualization/data/qabstract3dseries.h
@@ -19,13 +19,12 @@
 #ifndef QABSTRACT3DSERIES_H
 #define QABSTRACT3DSERIES_H
 
-#include <QtDataVisualization/qdatavisualizationenums.h>
 #include <QtDataVisualization/q3dtheme.h>
 #include <QObject>
 #include <QScopedPointer>
 #include <QLinearGradient>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QAbstract3DSeriesPrivate;
 
@@ -143,6 +142,6 @@ private:
     friend class Abstract3DRenderer;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qabstract3dseries_p.h b/src/datavisualization/data/qabstract3dseries_p.h
index 8e83ff84..c8a39818 100644
--- a/src/datavisualization/data/qabstract3dseries_p.h
+++ b/src/datavisualization/data/qabstract3dseries_p.h
@@ -33,7 +33,7 @@
 #ifndef QABSTRACT3DSERIES_P_H
 #define QABSTRACT3DSERIES_P_H
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QAbstractDataProxy;
 class Abstract3DController;
@@ -142,6 +142,6 @@ public:
     QString m_name;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // QAbstract3DSeries_P_H
diff --git a/src/datavisualization/data/qabstractdataproxy.cpp b/src/datavisualization/data/qabstractdataproxy.cpp
index fa0934c3..631bd8ac 100644
--- a/src/datavisualization/data/qabstractdataproxy.cpp
+++ b/src/datavisualization/data/qabstractdataproxy.cpp
@@ -20,7 +20,7 @@
 #include "qabstractdataproxy_p.h"
 #include "qabstract3dseries_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QAbstractDataProxy
@@ -110,4 +110,4 @@ void QAbstractDataProxyPrivate::setSeries(QAbstract3DSeries *series)
     m_series = series;
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h
index 2a053c60..cbe70333 100644
--- a/src/datavisualization/data/qabstractdataproxy.h
+++ b/src/datavisualization/data/qabstractdataproxy.h
@@ -19,11 +19,12 @@
 #ifndef QABSTRACTDATAPROXY_H
 #define QABSTRACTDATAPROXY_H
 
-#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/qdatavisualizationglobal.h>
+
 #include <QObject>
 #include <QScopedPointer>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QAbstractDataProxyPrivate;
 
@@ -58,6 +59,6 @@ private:
     friend class QAbstract3DSeriesPrivate;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // QABSTRACTDATAPROXY_H
diff --git a/src/datavisualization/data/qabstractdataproxy_p.h b/src/datavisualization/data/qabstractdataproxy_p.h
index 90504ccb..365ff5f2 100644
--- a/src/datavisualization/data/qabstractdataproxy_p.h
+++ b/src/datavisualization/data/qabstractdataproxy_p.h
@@ -33,7 +33,7 @@
 #ifndef QABSTRACTDATAPROXY_P_H
 #define QABSTRACTDATAPROXY_P_H
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QAbstract3DSeries;
 
@@ -56,6 +56,6 @@ private:
     friend class QAbstractDataProxy;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // QABSTRACTDATAPROXY_P_H
diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp
index cdf9333a..d7403712 100644
--- a/src/datavisualization/data/qbar3dseries.cpp
+++ b/src/datavisualization/data/qbar3dseries.cpp
@@ -19,7 +19,7 @@
 #include "qbar3dseries_p.h"
 #include "bars3dcontroller_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QBar3DSeries
@@ -275,4 +275,4 @@ void QBar3DSeriesPrivate::setSelectedBar(const QPoint &position)
     }
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h
index d4e948ad..96467a95 100644
--- a/src/datavisualization/data/qbar3dseries.h
+++ b/src/datavisualization/data/qbar3dseries.h
@@ -23,7 +23,7 @@
 #include <QtDataVisualization/qbardataproxy.h>
 #include <QPoint>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QBar3DSeriesPrivate;
 
@@ -60,6 +60,6 @@ private:
     friend class Bars3DController;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qbar3dseries_p.h b/src/datavisualization/data/qbar3dseries_p.h
index 89edb84a..8944a5f6 100644
--- a/src/datavisualization/data/qbar3dseries_p.h
+++ b/src/datavisualization/data/qbar3dseries_p.h
@@ -32,7 +32,7 @@
 #include "qbar3dseries.h"
 #include "qabstract3dseries_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QBar3DSeriesPrivate : public QAbstract3DSeriesPrivate
 {
@@ -55,6 +55,6 @@ private:
     friend class QBar3DSeries;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qbardataitem.cpp b/src/datavisualization/data/qbardataitem.cpp
index e564bd5d..0d69bc95 100644
--- a/src/datavisualization/data/qbardataitem.cpp
+++ b/src/datavisualization/data/qbardataitem.cpp
@@ -18,7 +18,7 @@
 
 #include "qbardataitem_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QBarDataItem
@@ -107,4 +107,4 @@ QBarDataItemPrivate::~QBarDataItemPrivate()
 {
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qbardataitem.h b/src/datavisualization/data/qbardataitem.h
index 60a4a19f..db604a5b 100644
--- a/src/datavisualization/data/qbardataitem.h
+++ b/src/datavisualization/data/qbardataitem.h
@@ -19,9 +19,7 @@
 #ifndef QBARDATAITEM_H
 #define QBARDATAITEM_H
 
-#include <QtDataVisualization/qdatavisualizationenums.h>
-
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QBarDataItemPrivate;
 
@@ -47,6 +45,6 @@ private:
     float m_value;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qbardataitem_p.h b/src/datavisualization/data/qbardataitem_p.h
index 20b7ea69..94cdf0a0 100644
--- a/src/datavisualization/data/qbardataitem_p.h
+++ b/src/datavisualization/data/qbardataitem_p.h
@@ -32,7 +32,7 @@
 #include "datavisualizationglobal_p.h"
 #include "qbardataitem.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QBarDataItemPrivate
 {
@@ -46,6 +46,6 @@ protected:
     friend class QBarDataItem;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp
index 71680ff2..5c89f7d4 100644
--- a/src/datavisualization/data/qbardataproxy.cpp
+++ b/src/datavisualization/data/qbardataproxy.cpp
@@ -20,7 +20,7 @@
 #include "qbardataproxy_p.h"
 #include "qbar3dseries_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QBarDataProxy
@@ -713,4 +713,4 @@ void QBarDataProxyPrivate::setSeries(QAbstract3DSeries *series)
     emit qptr()->seriesChanged(barSeries);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index 94e15116..c5938531 100644
--- a/src/datavisualization/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -24,7 +24,7 @@
 #include <QVector>
 #include <QStringList>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 typedef QVector<QBarDataItem> QBarDataRow;
 typedef QList<QBarDataRow *> QBarDataArray;
@@ -104,6 +104,6 @@ private:
     friend class Bars3DController;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // QBARDATAPROXY_H
diff --git a/src/datavisualization/data/qbardataproxy_p.h b/src/datavisualization/data/qbardataproxy_p.h
index 84726a02..f6ad0d51 100644
--- a/src/datavisualization/data/qbardataproxy_p.h
+++ b/src/datavisualization/data/qbardataproxy_p.h
@@ -33,7 +33,7 @@
 #include "qabstractdataproxy_p.h"
 #include "qbardataitem.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QBarDataProxyPrivate : public QAbstractDataProxyPrivate
 {
@@ -72,6 +72,6 @@ private:
     friend class QBarDataProxy;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // QBARDATAPROXY_P_H
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
index ce379592..96d6e45a 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
@@ -18,7 +18,7 @@
 
 #include "qheightmapsurfacedataproxy_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 // Default ranges correspond value axis defaults
 const float defaultMinValue = 0.0f;
@@ -548,4 +548,4 @@ void QHeightMapSurfaceDataProxyPrivate::handlePendingResolve()
     emit qptr()->heightMapChanged(m_heightMap);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h
index 16132b0d..42592bca 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h
@@ -23,7 +23,7 @@
 
 #include <QImage>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QHeightMapSurfaceDataProxyPrivate;
 
@@ -77,6 +77,6 @@ private:
     friend class Surface3DController;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
index 2d773344..0137511b 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
@@ -33,7 +33,7 @@
 #include "qsurfacedataproxy_p.h"
 #include <QTimer>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QHeightMapSurfaceDataProxyPrivate : public QSurfaceDataProxyPrivate
 {
@@ -64,6 +64,6 @@ private:
     friend class QHeightMapSurfaceDataProxy;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp
index e3354015..77c0463e 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp
@@ -20,7 +20,7 @@
 #include "baritemmodelhandler_p.h"
 #include <QTimer>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QItemModelBarDataProxy
@@ -489,4 +489,4 @@ QItemModelBarDataProxy *QItemModelBarDataProxyPrivate::qptr()
     return static_cast<QItemModelBarDataProxy *>(q_ptr);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h
index 597ab48f..8a946ca7 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy.h
@@ -23,7 +23,7 @@
 #include <QAbstractItemModel>
 #include <QStringList>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QItemModelBarDataProxyPrivate;
 
@@ -104,6 +104,6 @@ private:
     friend class BarItemModelHandler;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qitemmodelbardataproxy_p.h b/src/datavisualization/data/qitemmodelbardataproxy_p.h
index 63c5b3ff..16d48f9f 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy_p.h
@@ -32,7 +32,7 @@
 #include "qitemmodelbardataproxy.h"
 #include "qbardataproxy_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class BarItemModelHandler;
 
@@ -66,6 +66,6 @@ private:
     friend class QItemModelBarDataProxy;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
index 50b57423..e2ba8fec 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
@@ -20,7 +20,7 @@
 #include "scatteritemmodelhandler_p.h"
 #include <QTimer>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QItemModelScatterDataProxy
@@ -265,4 +265,4 @@ QItemModelScatterDataProxy *QItemModelScatterDataProxyPrivate::qptr()
     return static_cast<QItemModelScatterDataProxy *>(q_ptr);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index f2a7d78c..96fab6b6 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h
@@ -23,7 +23,7 @@
 #include <QAbstractItemModel>
 #include <QStringList>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QItemModelScatterDataProxyPrivate;
 
@@ -71,6 +71,6 @@ private:
     friend class ScatterItemModelHandler;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
index 8c86ef09..7b33704c 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
@@ -32,7 +32,7 @@
 #include "qitemmodelscatterdataproxy.h"
 #include "qscatterdataproxy_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class ScatterItemModelHandler;
 
@@ -57,6 +57,6 @@ private:
     friend class QItemModelScatterDataProxy;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
index 191e0d7f..7ca9842e 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
@@ -20,7 +20,7 @@
 #include "surfaceitemmodelhandler_p.h"
 #include <QTimer>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 // TODO: CHECK DOCUMENTATION!
 
@@ -499,4 +499,4 @@ QItemModelSurfaceDataProxy *QItemModelSurfaceDataProxyPrivate::qptr()
     return static_cast<QItemModelSurfaceDataProxy *>(q_ptr);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
index ee6b4d99..8c5b9ed4 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
@@ -23,7 +23,7 @@
 #include <QAbstractItemModel>
 #include <QStringList>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QItemModelSurfaceDataProxyPrivate;
 
@@ -104,6 +104,6 @@ private:
     friend class SurfaceItemModelHandler;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
index e4505c40..81230ab7 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
@@ -32,7 +32,7 @@
 #include "qitemmodelsurfacedataproxy.h"
 #include "qsurfacedataproxy_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class SurfaceItemModelHandler;
 
@@ -66,6 +66,6 @@ private:
     friend class QItemModelSurfaceDataProxy;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qscatter3dseries.cpp b/src/datavisualization/data/qscatter3dseries.cpp
index 10b2f84b..38e564f5 100644
--- a/src/datavisualization/data/qscatter3dseries.cpp
+++ b/src/datavisualization/data/qscatter3dseries.cpp
@@ -19,7 +19,7 @@
 #include "qscatter3dseries_p.h"
 #include "scatter3dcontroller_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QScatter3DSeries
@@ -301,4 +301,4 @@ void QScatter3DSeriesPrivate::setItemSize(float size)
         m_controller->markSeriesVisualsDirty();
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h
index 758277c0..a3192003 100644
--- a/src/datavisualization/data/qscatter3dseries.h
+++ b/src/datavisualization/data/qscatter3dseries.h
@@ -22,7 +22,7 @@
 #include <QtDataVisualization/qabstract3dseries.h>
 #include <QtDataVisualization/qscatterdataproxy.h>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QScatter3DSeriesPrivate;
 
@@ -64,6 +64,6 @@ private:
     friend class Scatter3DController;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qscatter3dseries_p.h b/src/datavisualization/data/qscatter3dseries_p.h
index a09536c9..aa638445 100644
--- a/src/datavisualization/data/qscatter3dseries_p.h
+++ b/src/datavisualization/data/qscatter3dseries_p.h
@@ -32,7 +32,7 @@
 #include "qscatter3dseries.h"
 #include "qabstract3dseries_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QScatter3DSeriesPrivate : public QAbstract3DSeriesPrivate
 {
@@ -56,6 +56,6 @@ private:
     friend class QScatter3DSeries;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qscatterdataitem.cpp b/src/datavisualization/data/qscatterdataitem.cpp
index 18c67ee8..cb6d5c70 100644
--- a/src/datavisualization/data/qscatterdataitem.cpp
+++ b/src/datavisualization/data/qscatterdataitem.cpp
@@ -18,7 +18,7 @@
 
 #include "qscatterdataitem_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QScatterDataItem
@@ -148,4 +148,4 @@ QScatterDataItemPrivate::~QScatterDataItemPrivate()
 {
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qscatterdataitem.h b/src/datavisualization/data/qscatterdataitem.h
index f139abd4..92f34f30 100644
--- a/src/datavisualization/data/qscatterdataitem.h
+++ b/src/datavisualization/data/qscatterdataitem.h
@@ -19,11 +19,10 @@
 #ifndef QSCATTERDATAITEM_H
 #define QSCATTERDATAITEM_H
 
-#include <QtDataVisualization/qdatavisualizationenums.h>
 #include <QVector3D>
 #include <QQuaternion>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QScatterDataItemPrivate;
 
@@ -58,6 +57,6 @@ private:
     QQuaternion m_rotation;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qscatterdataitem_p.h b/src/datavisualization/data/qscatterdataitem_p.h
index acc67347..c4dec45e 100644
--- a/src/datavisualization/data/qscatterdataitem_p.h
+++ b/src/datavisualization/data/qscatterdataitem_p.h
@@ -32,7 +32,7 @@
 #include "datavisualizationglobal_p.h"
 #include "qscatterdataitem.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QScatterDataItemPrivate
 {
@@ -46,6 +46,6 @@ protected:
     friend class QScatterDataItem;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp
index e0876d64..a58149a1 100644
--- a/src/datavisualization/data/qscatterdataproxy.cpp
+++ b/src/datavisualization/data/qscatterdataproxy.cpp
@@ -20,7 +20,7 @@
 #include "qscatterdataproxy_p.h"
 #include "qscatter3dseries_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QScatterDataProxy
@@ -408,4 +408,4 @@ QScatterDataProxy *QScatterDataProxyPrivate::qptr()
     return static_cast<QScatterDataProxy *>(q_ptr);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h
index acb3d3d4..b1c451b0 100644
--- a/src/datavisualization/data/qscatterdataproxy.h
+++ b/src/datavisualization/data/qscatterdataproxy.h
@@ -22,7 +22,7 @@
 #include <QtDataVisualization/qabstractdataproxy.h>
 #include <QtDataVisualization/qscatterdataitem.h>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 typedef QVector<QScatterDataItem> QScatterDataArray;
 
@@ -79,6 +79,6 @@ private:
     friend class Scatter3DController;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qscatterdataproxy_p.h b/src/datavisualization/data/qscatterdataproxy_p.h
index 322c8937..18ab7887 100644
--- a/src/datavisualization/data/qscatterdataproxy_p.h
+++ b/src/datavisualization/data/qscatterdataproxy_p.h
@@ -33,7 +33,7 @@
 #include "qabstractdataproxy_p.h"
 #include "qscatterdataitem.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QScatterDataProxyPrivate : public QAbstractDataProxyPrivate
 {
@@ -61,6 +61,6 @@ private:
     friend class QScatterDataProxy;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // QBARDATAPROXY_P_H
diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp
index 74b0ca90..0994e010 100644
--- a/src/datavisualization/data/qsurface3dseries.cpp
+++ b/src/datavisualization/data/qsurface3dseries.cpp
@@ -19,7 +19,7 @@
 #include "qsurface3dseries_p.h"
 #include "surface3dcontroller_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QSurface3DSeries
@@ -380,4 +380,4 @@ void QSurface3DSeriesPrivate::setDrawMode(QSurface3DSeries::DrawFlags mode)
         m_controller->markSeriesVisualsDirty();
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index 0ddd53da..d2109b3e 100644
--- a/src/datavisualization/data/qsurface3dseries.h
+++ b/src/datavisualization/data/qsurface3dseries.h
@@ -22,7 +22,7 @@
 #include <QtDataVisualization/qabstract3dseries.h>
 #include <QtDataVisualization/qsurfacedataproxy.h>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QSurface3DSeriesPrivate;
 
@@ -34,7 +34,7 @@ class QT_DATAVISUALIZATION_EXPORT QSurface3DSeries : public QAbstract3DSeries
     Q_PROPERTY(QPoint selectedPoint READ selectedPoint WRITE setSelectedPoint NOTIFY selectedPointChanged)
     Q_PROPERTY(bool flatShadingEnabled READ isFlatShadingEnabled WRITE setFlatShadingEnabled NOTIFY flatShadingEnabledChanged)
     Q_PROPERTY(bool flatShadingSupported READ isFlatShadingSupported NOTIFY flatShadingSupportedChanged)
-    Q_PROPERTY(QtDataVisualization::QSurface3DSeries::DrawFlags drawMode READ drawMode WRITE setDrawMode NOTIFY drawModeChanged)
+    Q_PROPERTY(DrawFlags drawMode READ drawMode WRITE setDrawMode NOTIFY drawModeChanged)
 
 public:
     enum DrawFlag {
@@ -81,6 +81,6 @@ private:
     friend class Surface3DController;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qsurface3dseries_p.h b/src/datavisualization/data/qsurface3dseries_p.h
index 00bfbed2..a9305268 100644
--- a/src/datavisualization/data/qsurface3dseries_p.h
+++ b/src/datavisualization/data/qsurface3dseries_p.h
@@ -32,7 +32,7 @@
 #include "qsurface3dseries.h"
 #include "qabstract3dseries_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QSurface3DSeriesPrivate : public QAbstract3DSeriesPrivate
 {
@@ -59,6 +59,6 @@ private:
     friend class QSurface3DSeries;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qsurfacedataitem.cpp b/src/datavisualization/data/qsurfacedataitem.cpp
index f5f91464..291038e2 100644
--- a/src/datavisualization/data/qsurfacedataitem.cpp
+++ b/src/datavisualization/data/qsurfacedataitem.cpp
@@ -18,7 +18,7 @@
 
 #include "qsurfacedataitem_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QSurfaceDataItem
@@ -140,4 +140,4 @@ QSurfaceDataItemPrivate::~QSurfaceDataItemPrivate()
 {
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qsurfacedataitem.h b/src/datavisualization/data/qsurfacedataitem.h
index dbc849d3..a4d0eb27 100644
--- a/src/datavisualization/data/qsurfacedataitem.h
+++ b/src/datavisualization/data/qsurfacedataitem.h
@@ -19,10 +19,9 @@
 #ifndef QSURFACEDATAITEM_H
 #define QSURFACEDATAITEM_H
 
-#include <QtDataVisualization/qdatavisualizationenums.h>
 #include <QVector3D>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QSurfaceDataItemPrivate;
 
@@ -54,6 +53,6 @@ private:
     QVector3D m_position;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qsurfacedataitem_p.h b/src/datavisualization/data/qsurfacedataitem_p.h
index d13679a8..538bb6d9 100644
--- a/src/datavisualization/data/qsurfacedataitem_p.h
+++ b/src/datavisualization/data/qsurfacedataitem_p.h
@@ -32,7 +32,7 @@
 #include "datavisualizationglobal_p.h"
 #include "qsurfacedataitem.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QSurfaceDataItemPrivate
 {
@@ -46,6 +46,6 @@ protected:
     friend class QSurfaceDataItem;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp
index 5ea05d75..e3a6cb13 100644
--- a/src/datavisualization/data/qsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qsurfacedataproxy.cpp
@@ -20,7 +20,7 @@
 #include "qsurfacedataproxy_p.h"
 #include "qsurface3dseries_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QSurfaceDataProxy
@@ -520,4 +520,4 @@ void QSurfaceDataProxyPrivate::setSeries(QAbstract3DSeries *series)
     emit qptr()->seriesChanged(surfaceSeries);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index 04c6dbf7..f4015fee 100644
--- a/src/datavisualization/data/qsurfacedataproxy.h
+++ b/src/datavisualization/data/qsurfacedataproxy.h
@@ -22,7 +22,7 @@
 #include <QtDataVisualization/qabstractdataproxy.h>
 #include <QtDataVisualization/qsurfacedataitem.h>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 typedef QVector<QSurfaceDataItem> QSurfaceDataRow;
 typedef QList<QSurfaceDataRow *> QSurfaceDataArray;
@@ -86,6 +86,6 @@ private:
     friend class Surface3DController;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // QSURFACEDATAPROXY_H
diff --git a/src/datavisualization/data/qsurfacedataproxy_p.h b/src/datavisualization/data/qsurfacedataproxy_p.h
index 1fda354c..d01b4383 100644
--- a/src/datavisualization/data/qsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qsurfacedataproxy_p.h
@@ -34,7 +34,7 @@
 
 #include <QSize>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QSurfaceDataProxyPrivate : public QAbstractDataProxyPrivate
 {
@@ -67,6 +67,6 @@ private:
     friend class QSurfaceDataProxy;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif // QSURFACEDATAPROXY_P_H
diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp
index a70b35b0..f5bac672 100644
--- a/src/datavisualization/data/scatteritemmodelhandler.cpp
+++ b/src/datavisualization/data/scatteritemmodelhandler.cpp
@@ -19,7 +19,7 @@
 #include "scatteritemmodelhandler_p.h"
 #include <QTimer>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 ScatterItemModelHandler::ScatterItemModelHandler(QItemModelScatterDataProxy *proxy, QObject *parent)
     : AbstractItemModelHandler(parent),
@@ -77,4 +77,4 @@ void ScatterItemModelHandler::resolveModel()
     m_proxy->resetArray(m_proxyArray);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/scatteritemmodelhandler_p.h b/src/datavisualization/data/scatteritemmodelhandler_p.h
index 72f8f76c..b59b3aa7 100644
--- a/src/datavisualization/data/scatteritemmodelhandler_p.h
+++ b/src/datavisualization/data/scatteritemmodelhandler_p.h
@@ -32,7 +32,7 @@
 #include "abstractitemmodelhandler_p.h"
 #include "qitemmodelscatterdataproxy_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class ScatterItemModelHandler : public AbstractItemModelHandler
 {
@@ -48,6 +48,6 @@ protected:
     QScatterDataArray *m_proxyArray; // Not owned
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/scatterrenderitem.cpp b/src/datavisualization/data/scatterrenderitem.cpp
index 83c66583..be6d3852 100644
--- a/src/datavisualization/data/scatterrenderitem.cpp
+++ b/src/datavisualization/data/scatterrenderitem.cpp
@@ -20,7 +20,7 @@
 #include "scatter3drenderer_p.h"
 #include "qscatterdataproxy.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 ScatterRenderItem::ScatterRenderItem()
     : AbstractRenderItem(),
@@ -39,4 +39,4 @@ ScatterRenderItem::~ScatterRenderItem()
 {
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/scatterrenderitem_p.h b/src/datavisualization/data/scatterrenderitem_p.h
index 047caeb6..7b7d51f6 100644
--- a/src/datavisualization/data/scatterrenderitem_p.h
+++ b/src/datavisualization/data/scatterrenderitem_p.h
@@ -31,7 +31,7 @@
 
 #include "abstractrenderitem_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class Scatter3DRenderer;
 
@@ -82,6 +82,6 @@ void ScatterRenderItem::setRotation(const QQuaternion &rotation)
 
 typedef QVector<ScatterRenderItem> ScatterRenderItemArray;
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp
index 10b4ccc5..ac1a8b81 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler.cpp
+++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp
@@ -18,7 +18,7 @@
 
 #include "surfaceitemmodelhandler_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 SurfaceItemModelHandler::SurfaceItemModelHandler(QItemModelSurfaceDataProxy *proxy, QObject *parent)
     : AbstractItemModelHandler(parent),
@@ -139,4 +139,4 @@ void SurfaceItemModelHandler::resolveModel()
     m_proxy->resetArray(m_proxyArray);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/surfaceitemmodelhandler_p.h b/src/datavisualization/data/surfaceitemmodelhandler_p.h
index de0d2885..edca9dca 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler_p.h
+++ b/src/datavisualization/data/surfaceitemmodelhandler_p.h
@@ -32,7 +32,7 @@
 #include "abstractitemmodelhandler_p.h"
 #include "qitemmodelsurfacedataproxy_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class SurfaceItemModelHandler : public AbstractItemModelHandler
 {
@@ -48,6 +48,6 @@ protected:
     QSurfaceDataArray *m_proxyArray; // Not owned
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
-- 
cgit v1.2.3