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>

9 files changed, 20 insertions, 19 deletions

diff --git a/src/datavisualization/axis/qabstract3daxis.cpp b/src/datavisualization/axis/qabstract3daxis.cpp
index 5f1121c4..d2c0f6e8 100644
--- a/src/datavisualization/axis/qabstract3daxis.cpp
+++ b/src/datavisualization/axis/qabstract3daxis.cpp
@@ -19,7 +19,7 @@
 #include "qabstract3daxis.h"
 #include "qabstract3daxis_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QAbstract3DAxis
@@ -401,4 +401,4 @@ void QAbstract3DAxisPrivate::setMax(float max)
     }
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h
index ef9f9c78..c85e50d0 100644
--- a/src/datavisualization/axis/qabstract3daxis.h
+++ b/src/datavisualization/axis/qabstract3daxis.h
@@ -19,13 +19,14 @@
 #ifndef QABSTRACT3DAXIS_H
 #define QABSTRACT3DAXIS_H
 
-#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/qdatavisualizationglobal.h>
+
 #include <QObject>
 #include <QScopedPointer>
 #include <QVector>
 #include <QStringList>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QAbstract3DAxisPrivate;
 
@@ -102,6 +103,6 @@ private:
     friend class Bars3DController;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/axis/qabstract3daxis_p.h b/src/datavisualization/axis/qabstract3daxis_p.h
index da6964ad..4403cc16 100644
--- a/src/datavisualization/axis/qabstract3daxis_p.h
+++ b/src/datavisualization/axis/qabstract3daxis_p.h
@@ -33,7 +33,7 @@
 #ifndef QABSTRACT3DAXIS_P_H
 #define QABSTRACT3DAXIS_P_H
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QAbstract3DAxisPrivate : public QObject
 {
@@ -72,6 +72,6 @@ protected:
     friend class QCategory3DAxis;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/axis/qcategory3daxis.cpp b/src/datavisualization/axis/qcategory3daxis.cpp
index b5999aaa..0a0cc2e8 100644
--- a/src/datavisualization/axis/qcategory3daxis.cpp
+++ b/src/datavisualization/axis/qcategory3daxis.cpp
@@ -21,7 +21,7 @@
 #include "bars3dcontroller_p.h"
 #include "qbardataproxy.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QCategory3DAxis
@@ -153,4 +153,4 @@ QCategory3DAxis *QCategory3DAxisPrivate::qptr()
     return static_cast<QCategory3DAxis *>(q_ptr);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/axis/qcategory3daxis.h b/src/datavisualization/axis/qcategory3daxis.h
index fdedf795..2d3235b4 100644
--- a/src/datavisualization/axis/qcategory3daxis.h
+++ b/src/datavisualization/axis/qcategory3daxis.h
@@ -21,7 +21,7 @@
 
 #include <QtDataVisualization/qabstract3daxis.h>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QCategory3DAxisPrivate;
 
@@ -48,6 +48,6 @@ private:
     friend class Bars3DController;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/axis/qcategory3daxis_p.h b/src/datavisualization/axis/qcategory3daxis_p.h
index dfcc9961..6449e999 100644
--- a/src/datavisualization/axis/qcategory3daxis_p.h
+++ b/src/datavisualization/axis/qcategory3daxis_p.h
@@ -33,7 +33,7 @@
 #ifndef QCATEGORY3DAXIS_P_H
 #define QCATEGORY3DAXIS_P_H
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QCategory3DAxisPrivate : public QAbstract3DAxisPrivate
 {
@@ -52,6 +52,6 @@ private:
     friend class QCategory3DAxis;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/axis/qvalue3daxis.cpp b/src/datavisualization/axis/qvalue3daxis.cpp
index a88a9ef5..b34d7511 100644
--- a/src/datavisualization/axis/qvalue3daxis.cpp
+++ b/src/datavisualization/axis/qvalue3daxis.cpp
@@ -20,7 +20,7 @@
 #include "qvalue3daxis_p.h"
 #include "utils_p.h"
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 /*!
  * \class QValue3DAxis
@@ -267,4 +267,4 @@ QValue3DAxis *QValue3DAxisPrivate::qptr()
     return static_cast<QValue3DAxis *>(q_ptr);
 }
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h
index 3bdeb678..c842167c 100644
--- a/src/datavisualization/axis/qvalue3daxis.h
+++ b/src/datavisualization/axis/qvalue3daxis.h
@@ -21,7 +21,7 @@
 
 #include <QtDataVisualization/qabstract3daxis.h>
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QValue3DAxisPrivate;
 
@@ -60,6 +60,6 @@ private:
     friend class Surface3DController;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif
diff --git a/src/datavisualization/axis/qvalue3daxis_p.h b/src/datavisualization/axis/qvalue3daxis_p.h
index 508453e8..08dab486 100644
--- a/src/datavisualization/axis/qvalue3daxis_p.h
+++ b/src/datavisualization/axis/qvalue3daxis_p.h
@@ -32,7 +32,7 @@
 #ifndef QVALUE3DAXIS_P_H
 #define QVALUE3DAXIS_P_H
 
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
 
 class QValue3DAxisPrivate : public QAbstract3DAxisPrivate
 {
@@ -61,6 +61,6 @@ private:
     friend class QValue3DAxis;
 };
 
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
 
 #endif