Reintroduced namespace macros

Task-number: QTRD-2594

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

9 files changed, 22 insertions, 36 deletions

diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp
index 0a79db27..27ebf89d 100644
--- a/src/datavisualization/input/q3dinputhandler.cpp
+++ b/src/datavisualization/input/q3dinputhandler.cpp
@@ -21,7 +21,7 @@
 #include "q3dcamera_p.h"
 #include "q3dlight.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 const int minZoomLevel         = 10;
 const int halfSizeZoomLevel    = 50;
@@ -35,7 +35,7 @@ const int farZoomRangeDivider  = 120;
 const float rotationSpeed      = 100.0f;
 
 /*!
- * \class QtDataVisualization::Q3DInputHandler
+ * \class Q3DInputHandler
  * \inmodule QtDataVisualization
  * \brief Basic wheel mouse based input handler.
  * \since Qt Data Visualization 1.0
@@ -190,9 +190,4 @@ void Q3DInputHandler::wheelEvent(QWheelEvent *event)
     scene()->activeCamera()->setZoomLevel(zoomLevel);
 }
 
-/*!
- * \class QtDataVisualization::Q3DInputHandlerPrivate
- * \internal
- */
-
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h
index 7b5f3aca..501ac004 100644
--- a/src/datavisualization/input/q3dinputhandler.h
+++ b/src/datavisualization/input/q3dinputhandler.h
@@ -21,7 +21,7 @@
 
 #include <QtDataVisualization/qabstract3dinputhandler.h>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DInputHandlerPrivate;
 
@@ -45,6 +45,6 @@ private:
     QScopedPointer<Q3DInputHandlerPrivate> *d_ptr;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // QDEFAULT3DINPUTHANDLER_H
diff --git a/src/datavisualization/input/q3dinputhandler_p.h b/src/datavisualization/input/q3dinputhandler_p.h
index 8724f5bf..df8a1978 100644
--- a/src/datavisualization/input/q3dinputhandler_p.h
+++ b/src/datavisualization/input/q3dinputhandler_p.h
@@ -31,7 +31,7 @@
 
 #include "datavisualizationglobal_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Q3DInputHandler;
 
@@ -46,6 +46,6 @@ public:
 
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // Q3DINPUTHANDLER_P_H
diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp
index 32f60a6c..e7374657 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.cpp
+++ b/src/datavisualization/input/qabstract3dinputhandler.cpp
@@ -17,10 +17,10 @@
 ****************************************************************************/
 #include "qabstract3dinputhandler_p.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
- * \class QtDataVisualization::QAbstract3DInputHandler
+ * \class QAbstract3DInputHandler
  * \inmodule QtDataVisualization
  * \brief The base class for implementations of input handlers.
  * \since Qt Data Visualization 1.0
@@ -55,7 +55,7 @@ namespace QtDataVisualization {
  * \inqmlmodule QtDataVisualization
  * \since QtDataVisualization 1.0
  * \ingroup datavisualization_qml
- * \instantiates QtDataVisualization::QAbstract3DInputHandler
+ * \instantiates QAbstract3DInputHandler
  * \brief Base type for all QtDataVisualization input handlers.
  *
  * This type is uncreatable.
@@ -227,11 +227,6 @@ QPoint QAbstract3DInputHandler::previousInputPos() const
     return d_ptr->m_previousInputPos;
 }
 
-
-/*!
- * \class QtDataVisualization::QAbstract3DInputHandlerPrivate
- * \internal
- */
 QAbstract3DInputHandlerPrivate::QAbstract3DInputHandlerPrivate(QAbstract3DInputHandler *q) :
     q_ptr(q),
     m_prevDistance(0),
@@ -247,4 +242,4 @@ QAbstract3DInputHandlerPrivate::~QAbstract3DInputHandlerPrivate()
 
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h
index 2ad1514b..f8b8ba88 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.h
+++ b/src/datavisualization/input/qabstract3dinputhandler.h
@@ -22,7 +22,7 @@
 #include <QtDataVisualization/q3dscene.h>
 #include <QMouseEvent>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QAbstract3DInputHandlerPrivate;
 
@@ -87,6 +87,6 @@ private:
     friend class QTouch3DInputHandlerPrivate;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // QABSTRACT3DINPUTHANDLER_H
diff --git a/src/datavisualization/input/qabstract3dinputhandler_p.h b/src/datavisualization/input/qabstract3dinputhandler_p.h
index a44cc40d..7e616ec2 100644
--- a/src/datavisualization/input/qabstract3dinputhandler_p.h
+++ b/src/datavisualization/input/qabstract3dinputhandler_p.h
@@ -33,7 +33,7 @@
 #include "qabstract3dinputhandler.h"
 #include <QRect>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QAbstract3DInputHandler;
 class Q3DScene;
@@ -65,6 +65,6 @@ private:
     friend class Abstract3DController;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // QABSTRACT3DINPUTHANDLER_P_H
diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp
index f5be97df..909beb74 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.cpp
+++ b/src/datavisualization/input/qtouch3dinputhandler.cpp
@@ -21,7 +21,7 @@
 #include <QTimer>
 #include <qmath.h>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 const float maxTapAndHoldJitter = 20.0f;
 const int maxPinchJitter = 10;
@@ -36,7 +36,7 @@ const int minZoomLevel = 10;
 const int maxZoomLevel = 500;
 
 /*!
- * \class QtDataVisualization::QTouch3DInputHandler
+ * \class QTouch3DInputHandler
  * \inmodule QtDataVisualization
  * \brief Basic touch display based input handler.
  * \since Qt Data Visualization 1.0
@@ -129,10 +129,6 @@ void QTouch3DInputHandler::touchEvent(QTouchEvent *event)
     }
 }
 
-/*!
- * \class QtDataVisualization::QTouch3DInputHandlerPrivate
- * \internal
- */
 QTouch3DInputHandlerPrivate::QTouch3DInputHandlerPrivate(QTouch3DInputHandler *q)
     : q_ptr(q),
       m_holdTimer(0)
@@ -213,4 +209,4 @@ void QTouch3DInputHandlerPrivate::handleRotation(const QPointF &position)
     }
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/input/qtouch3dinputhandler.h b/src/datavisualization/input/qtouch3dinputhandler.h
index 0f3cd255..fef63c3b 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.h
+++ b/src/datavisualization/input/qtouch3dinputhandler.h
@@ -21,7 +21,7 @@
 
 #include <QtDataVisualization/q3dinputhandler.h>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QTouch3DInputHandlerPrivate;
 
@@ -42,6 +42,6 @@ private:
     QScopedPointer<QTouch3DInputHandlerPrivate> d_ptr;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // QTOUCH3DINPUTHANDLER_H
diff --git a/src/datavisualization/input/qtouch3dinputhandler_p.h b/src/datavisualization/input/qtouch3dinputhandler_p.h
index e8d1793b..143c828d 100644
--- a/src/datavisualization/input/qtouch3dinputhandler_p.h
+++ b/src/datavisualization/input/qtouch3dinputhandler_p.h
@@ -21,7 +21,7 @@
 
 #include "qtouch3dinputhandler.h"
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class QAbstract3DInputHandler;
 
@@ -45,6 +45,6 @@ public:
     QPointF m_touchHoldPos;
 };
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // QTOUCH3DINPUTHANDLER_H