Move collision aspect into its own namespace

Change-Id: Ib8c2b2501d6fc074dc7d1c462befbd8ff4631a30
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

19 files changed, 61 insertions, 59 deletions

diff --git a/src/collision/qabstractcollider.cpp b/src/collision/qabstractcollider.cpp
index 2233ecfc3..7544cdcdf 100644
--- a/src/collision/qabstractcollider.cpp
+++ b/src/collision/qabstractcollider.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 /*!
     \class Qt3D::QAbstractColliderPrivate
@@ -84,5 +84,5 @@ void QAbstractCollider::onExited(QCollisionEvent *e)
 
 QT_END_NAMESPACE
 
-} // namespace Qt3D
+} // namespace Qt3DCollision
 
diff --git a/src/collision/qabstractcollider.h b/src/collision/qabstractcollider.h
index 63dd23e52..b11eb1c9f 100644
--- a/src/collision/qabstractcollider.h
+++ b/src/collision/qabstractcollider.h
@@ -42,12 +42,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 class QAbstractColliderPrivate;
 class QCollisionEvent;
 
-class QT3DCOLLISIONSHARED_EXPORT QAbstractCollider : public QComponent
+class QT3DCOLLISIONSHARED_EXPORT QAbstractCollider : public Qt3D::QComponent
 {
     Q_OBJECT
 
@@ -70,7 +70,7 @@ private:
     Q_DECLARE_PRIVATE(QAbstractCollider)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCollision
 
 QT_END_NAMESPACE
 
diff --git a/src/collision/qabstractcollider_p.h b/src/collision/qabstractcollider_p.h
index 8bdda19d6..3aabd77f5 100644
--- a/src/collision/qabstractcollider_p.h
+++ b/src/collision/qabstractcollider_p.h
@@ -41,11 +41,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 class QAbstractCollider;
 
-class QAbstractColliderPrivate : public QComponentPrivate
+class QAbstractColliderPrivate : public Qt3D::QComponentPrivate
 {
 public:
     QAbstractColliderPrivate();
@@ -53,7 +53,7 @@ public:
     Q_DECLARE_PUBLIC(QAbstractCollider)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCollision
 
 QT_END_NAMESPACE
 
diff --git a/src/collision/qboxcollider.cpp b/src/collision/qboxcollider.cpp
index dba192b99..d911cae6b 100644
--- a/src/collision/qboxcollider.cpp
+++ b/src/collision/qboxcollider.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 /*!
     \class Qt3D::QBoxColliderPrivate
@@ -120,5 +120,5 @@ void QBoxCollider::setRadii(const QVector3D &radii)
 
 QT_END_NAMESPACE
 
-} // namespace Qt3D
+} // namespace Qt3DCollision
 
diff --git a/src/collision/qboxcollider.h b/src/collision/qboxcollider.h
index 90a3c49d8..4d435ec60 100644
--- a/src/collision/qboxcollider.h
+++ b/src/collision/qboxcollider.h
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 class QBoxColliderPrivate;
 
@@ -76,7 +76,7 @@ private:
     QT3D_CLONEABLE(QBoxCollider)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCollision
 
 QT_END_NAMESPACE
 
diff --git a/src/collision/qboxcollider_p.h b/src/collision/qboxcollider_p.h
index 3946bf82f..d5d328e96 100644
--- a/src/collision/qboxcollider_p.h
+++ b/src/collision/qboxcollider_p.h
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 class QBoxCollider;
 
@@ -56,7 +56,7 @@ class QBoxColliderPrivate : public QAbstractColliderPrivate
     QVector3D m_radii;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCollision
 
 QT_END_NAMESPACE
 
diff --git a/src/collision/qcapsulecollider.cpp b/src/collision/qcapsulecollider.cpp
index 778c0309d..c7caefd84 100644
--- a/src/collision/qcapsulecollider.cpp
+++ b/src/collision/qcapsulecollider.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 /*!
     \class Qt3D::QCapsuleColliderPrivate
@@ -142,7 +142,7 @@ void QCapsuleCollider::setLength(float length)
     emit lengthChanged(length);
 }
 
-void QCapsuleCollider::setAxisDirection(Qt3D::QCapsuleCollider::Direction axisDirection)
+void QCapsuleCollider::setAxisDirection(Qt3DCollision::QCapsuleCollider::Direction axisDirection)
 {
     Q_D(QCapsuleCollider);
     if (d->m_axisDirection == axisDirection)
@@ -154,5 +154,5 @@ void QCapsuleCollider::setAxisDirection(Qt3D::QCapsuleCollider::Direction axisDi
 
 QT_END_NAMESPACE
 
-} // namespace Qt3D
+} // namespace Qt3DCollision
 
diff --git a/src/collision/qcapsulecollider.h b/src/collision/qcapsulecollider.h
index eeab609b8..5804ea71c 100644
--- a/src/collision/qcapsulecollider.h
+++ b/src/collision/qcapsulecollider.h
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 class QCapsuleColliderPrivate;
 
@@ -75,13 +75,13 @@ public Q_SLOTS:
     void setCenter(const QVector3D &center);
     void setRadius(float radius);
     void setLength(float length);
-    void setAxisDirection(Qt3D::QCapsuleCollider::Direction axisDirection);
+    void setAxisDirection(Qt3DCollision::QCapsuleCollider::Direction axisDirection);
 
 Q_SIGNALS:
     void centerChanged(QVector3D center);
     void radiusChanged(float radius);
     void lengthChanged(float length);
-    void axisDirectionChanged(Qt3D::QCapsuleCollider::Direction axisDirection);
+    void axisDirectionChanged(Qt3DCollision::QCapsuleCollider::Direction axisDirection);
 
 protected:
     QCapsuleCollider(QCapsuleColliderPrivate &dd, QNode *parent = 0);
@@ -91,7 +91,7 @@ private:
     QT3D_CLONEABLE(QCapsuleCollider)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCollision
 
 QT_END_NAMESPACE
 
diff --git a/src/collision/qcapsulecollider_p.h b/src/collision/qcapsulecollider_p.h
index 6f1536267..1cca992d2 100644
--- a/src/collision/qcapsulecollider_p.h
+++ b/src/collision/qcapsulecollider_p.h
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 class QCapsuleCollider;
 
@@ -58,7 +58,7 @@ class QCapsuleColliderPrivate : public QAbstractColliderPrivate
     QCapsuleCollider::Direction m_axisDirection;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCollision
 
 QT_END_NAMESPACE
 
diff --git a/src/collision/qcollisionaspect.cpp b/src/collision/qcollisionaspect.cpp
index 16e52b3b4..408431ea3 100644
--- a/src/collision/qcollisionaspect.cpp
+++ b/src/collision/qcollisionaspect.cpp
@@ -49,14 +49,16 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DCollision {
 
 /*!
     \class Qt3D::QCollisionAspectPrivate
     \internal
 */
 QCollisionAspectPrivate::QCollisionAspectPrivate()
-    : QAbstractAspectPrivate()
+    : Qt3D::QAbstractAspectPrivate()
     , m_time(0)
 {
     m_aspectType = QAbstractAspect::AspectCollision;
@@ -80,36 +82,36 @@ void QCollisionAspect::registerBackendTypes()
     //registerBackendType<QSphereCollider>(QBackendNodeFunctorPtr(new Collision::SphereColliderFunctor(d_func()->m_manager.data())));
 }
 
-QVector<QAspectJobPtr> QCollisionAspect::jobsToExecute(qint64 time)
+QVector<Qt3D::QAspectJobPtr> QCollisionAspect::jobsToExecute(qint64 time)
 {
     Q_D(QCollisionAspect);
     d->m_time = time;
 
     // Create jobs that will get exectued by the threadpool
-    QVector<QAspectJobPtr> jobs;
+    QVector<Qt3D::QAspectJobPtr> jobs;
     return jobs;
 }
 
-void QCollisionAspect::sceneNodeAdded(QSceneChangePtr &e)
+void QCollisionAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e)
 {
-    QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
+    QScenePropertyChangePtr propertyChange = e.staticCast<Qt3D::QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
     QNode *n = nodePtr.data();
     QNodeVisitor visitor;
     visitor.traverse(n, this, &QCollisionAspect::visitNode);
 }
 
-void QCollisionAspect::sceneNodeRemoved(QSceneChangePtr &e)
+void QCollisionAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e)
 {
-    QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
-    QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
+    QScenePropertyChangePtr propertyChange = e.staticCast<Qt3D::QScenePropertyChange>();
+    QNodePtr nodePtr = propertyChange->value().value<Qt3D::QNodePtr>();
     QNode *n = nodePtr.data();
     QAbstractAspect::clearBackendNode(n);
 }
 
-void QCollisionAspect::setRootEntity(QEntity *rootObject)
+void QCollisionAspect::setRootEntity(Qt3D::QEntity *rootObject)
 {
-    QNodeVisitor visitor;
+    Qt3D::QNodeVisitor visitor;
     visitor.traverse(rootObject, this, &QCollisionAspect::visitNode);
 }
 
@@ -122,7 +124,7 @@ void QCollisionAspect::onCleanup()
 {
 }
 
-void QCollisionAspect::visitNode(QNode *node)
+void QCollisionAspect::visitNode(Qt3D::QNode *node)
 {
     QAbstractAspect::createBackendNode(node);
 }
@@ -131,5 +133,5 @@ void QCollisionAspect::visitNode(QNode *node)
 
 QT_END_NAMESPACE
 
-QT3D_REGISTER_NAMESPACED_ASPECT("collision", QT_PREPEND_NAMESPACE(Qt3D), QCollisionAspect)
+QT3D_REGISTER_NAMESPACED_ASPECT("collision", QT_PREPEND_NAMESPACE(Qt3DCollision), QCollisionAspect)
 
diff --git a/src/collision/qcollisionaspect.h b/src/collision/qcollisionaspect.h
index 2c946b640..5095b18ba 100644
--- a/src/collision/qcollisionaspect.h
+++ b/src/collision/qcollisionaspect.h
@@ -42,30 +42,30 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 class QCollisionAspectPrivate;
 
-class QT3DCOLLISIONSHARED_EXPORT QCollisionAspect : public QAbstractAspect
+class QT3DCOLLISIONSHARED_EXPORT QCollisionAspect : public Qt3D::QAbstractAspect
 {
     Q_OBJECT
 public:
     explicit QCollisionAspect(QObject *parent = 0);
 
-    QVector<QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
+    QVector<Qt3D::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
 
-    void sceneNodeAdded(QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void sceneNodeRemoved(QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeAdded(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeRemoved(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 protected:
     void registerBackendTypes();
 
 private:
-    void setRootEntity(QEntity *rootObject) Q_DECL_OVERRIDE;
+    void setRootEntity(Qt3D::QEntity *rootObject) Q_DECL_OVERRIDE;
     void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE;
     void onCleanup() Q_DECL_OVERRIDE;
 
-    void visitNode(QNode *node);
+    void visitNode(Qt3D::QNode *node);
 
     Q_DECLARE_PRIVATE(QCollisionAspect)
     QCollisionAspect(QCollisionAspectPrivate &dd, QObject *parent);
diff --git a/src/collision/qcollisionaspect_p.h b/src/collision/qcollisionaspect_p.h
index e91f2d33e..bbcda1178 100644
--- a/src/collision/qcollisionaspect_p.h
+++ b/src/collision/qcollisionaspect_p.h
@@ -41,9 +41,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
-class QCollisionAspectPrivate : public QAbstractAspectPrivate
+class QCollisionAspectPrivate : public Qt3D::QAbstractAspectPrivate
 {
     QCollisionAspectPrivate();
 
diff --git a/src/collision/qgeometrycollider.cpp b/src/collision/qgeometrycollider.cpp
index 86d8bb8aa..6f7458dca 100644
--- a/src/collision/qgeometrycollider.cpp
+++ b/src/collision/qgeometrycollider.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 /*!
     \class Qt3DRender::QGeometryColliderPrivate
@@ -86,5 +86,5 @@ QGeometryCollider::~QGeometryCollider()
 
 QT_END_NAMESPACE
 
-} // namespace Qt3D
+} // namespace Qt3DCollision
 
diff --git a/src/collision/qgeometrycollider.h b/src/collision/qgeometrycollider.h
index b8961d10a..893f097c0 100644
--- a/src/collision/qgeometrycollider.h
+++ b/src/collision/qgeometrycollider.h
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 class QGeometryColliderPrivate;
 
@@ -64,7 +64,7 @@ private:
     QT3D_CLONEABLE(QGeometryCollider)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCollision
 
 QT_END_NAMESPACE
 
diff --git a/src/collision/qgeometrycollider_p.h b/src/collision/qgeometrycollider_p.h
index 4f51157d6..38c1407af 100644
--- a/src/collision/qgeometrycollider_p.h
+++ b/src/collision/qgeometrycollider_p.h
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 class QGeometryCollider;
 
@@ -52,7 +52,7 @@ class QGeometryColliderPrivate : public QAbstractColliderPrivate
     Q_DECLARE_PUBLIC(QGeometryCollider)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCollision
 
 QT_END_NAMESPACE
 
diff --git a/src/collision/qspherecollider.cpp b/src/collision/qspherecollider.cpp
index 1dc977fa5..c968494aa 100644
--- a/src/collision/qspherecollider.cpp
+++ b/src/collision/qspherecollider.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 /*!
     \class Qt3D::QSphereColliderPrivate
diff --git a/src/collision/qspherecollider.h b/src/collision/qspherecollider.h
index 20c2e0595..4e9cfc68d 100644
--- a/src/collision/qspherecollider.h
+++ b/src/collision/qspherecollider.h
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 class QSphereColliderPrivate;
 
diff --git a/src/collision/qspherecollider_p.h b/src/collision/qspherecollider_p.h
index e97152cfe..698684c9a 100644
--- a/src/collision/qspherecollider_p.h
+++ b/src/collision/qspherecollider_p.h
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCollision {
 
 class QSphereCollider;
 
diff --git a/src/quick3d/imports/collision/qt3dquick3dcollisionplugin.cpp b/src/quick3d/imports/collision/qt3dquick3dcollisionplugin.cpp
index 650a77bd4..25e3cce6e 100644
--- a/src/quick3d/imports/collision/qt3dquick3dcollisionplugin.cpp
+++ b/src/quick3d/imports/collision/qt3dquick3dcollisionplugin.cpp
@@ -46,11 +46,11 @@ QT_BEGIN_NAMESPACE
 
 void Qt3DQuick3DCollisionPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterUncreatableType<Qt3D::QAbstractCollider>(uri, 2, 0, "AbstractCollider", "AbstractColliders are only used for references");
-    qmlRegisterType<Qt3D::QBoxCollider>(uri, 2, 0, "BoxCollider");
-    qmlRegisterType<Qt3D::QCapsuleCollider>(uri, 2, 0, "CapsuleCollider");
-    qmlRegisterType<Qt3D::QGeometryCollider>(uri, 2, 0, "GeometryCollider");
-    qmlRegisterType<Qt3D::QSphereCollider>(uri, 2, 0, "SphereCollider");
+    qmlRegisterUncreatableType<Qt3DCollision::QAbstractCollider>(uri, 2, 0, "AbstractCollider", "AbstractColliders are only used for references");
+    qmlRegisterType<Qt3DCollision::QBoxCollider>(uri, 2, 0, "BoxCollider");
+    qmlRegisterType<Qt3DCollision::QCapsuleCollider>(uri, 2, 0, "CapsuleCollider");
+    qmlRegisterType<Qt3DCollision::QGeometryCollider>(uri, 2, 0, "GeometryCollider");
+    qmlRegisterType<Qt3DCollision::QSphereCollider>(uri, 2, 0, "SphereCollider");
 }
 
 QT_END_NAMESPACE