Make concrete collider types inherit from QAbstractCollider

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

12 files changed, 28 insertions, 28 deletions

diff --git a/src/collision/qboxcollider.cpp b/src/collision/qboxcollider.cpp
index 523b52d2b..dba192b99 100644
--- a/src/collision/qboxcollider.cpp
+++ b/src/collision/qboxcollider.cpp
@@ -46,7 +46,7 @@ namespace Qt3D {
     \internal
 */
 QBoxColliderPrivate::QBoxColliderPrivate()
-    : QComponentPrivate()
+    : QAbstractColliderPrivate()
     , m_center()
     , m_radii(0.5f, 0.5f, 0.5f) // Unit cube
 {
@@ -71,13 +71,13 @@ QBoxColliderPrivate::QBoxColliderPrivate()
     Constructs a new QBoxCollider instance with parent \a parent.
  */
 QBoxCollider::QBoxCollider(QNode *parent)
-    : QComponent(*new QBoxColliderPrivate, parent)
+    : QAbstractCollider(*new QBoxColliderPrivate, parent)
 {
 }
 
 /*! \internal */
 QBoxCollider::QBoxCollider(QBoxColliderPrivate &dd, QNode *parent)
-    : QComponent(dd, parent)
+    : QAbstractCollider(dd, parent)
 {
 }
 
diff --git a/src/collision/qboxcollider.h b/src/collision/qboxcollider.h
index 81aa7456f..90a3c49d8 100644
--- a/src/collision/qboxcollider.h
+++ b/src/collision/qboxcollider.h
@@ -37,7 +37,7 @@
 #ifndef QT3D_QBOXCOLLIDER_H
 #define QT3D_QBOXCOLLIDER_H
 
-#include <QComponent>
+#include <Qt3DCollision/qabstractcollider.h>
 #include <Qt3DCollision/qt3dcollision_global.h>
 #include <QtGui/qvector3d.h>
 
@@ -47,7 +47,7 @@ namespace Qt3D {
 
 class QBoxColliderPrivate;
 
-class QT3DCOLLISIONSHARED_EXPORT QBoxCollider : public QComponent
+class QT3DCOLLISIONSHARED_EXPORT QBoxCollider : public QAbstractCollider
 {
     Q_OBJECT
     Q_PROPERTY(QVector3D center READ center WRITE setCenter NOTIFY centerChanged)
diff --git a/src/collision/qboxcollider_p.h b/src/collision/qboxcollider_p.h
index 85c2e18d3..3946bf82f 100644
--- a/src/collision/qboxcollider_p.h
+++ b/src/collision/qboxcollider_p.h
@@ -37,7 +37,7 @@
 #ifndef QT3D_QBOXCOLLIDER_P_H
 #define QT3D_QBOXCOLLIDER_P_H
 
-#include <Qt3DCore/private/qcomponent_p.h>
+#include <Qt3DCollision/private/qabstractcollider_p.h>
 #include <QtGui/QVector3D>
 
 QT_BEGIN_NAMESPACE
@@ -46,7 +46,7 @@ namespace Qt3D {
 
 class QBoxCollider;
 
-class QBoxColliderPrivate : public QComponentPrivate
+class QBoxColliderPrivate : public QAbstractColliderPrivate
 {
     QBoxColliderPrivate();
 
diff --git a/src/collision/qcapsulecollider.cpp b/src/collision/qcapsulecollider.cpp
index 411c2c863..778c0309d 100644
--- a/src/collision/qcapsulecollider.cpp
+++ b/src/collision/qcapsulecollider.cpp
@@ -46,7 +46,7 @@ namespace Qt3D {
     \internal
 */
 QCapsuleColliderPrivate::QCapsuleColliderPrivate()
-    : QComponentPrivate()
+    : QAbstractColliderPrivate()
     , m_center()
     , m_radius(1.0f)
     , m_length(1.0f)
@@ -73,13 +73,13 @@ QCapsuleColliderPrivate::QCapsuleColliderPrivate()
     Constructs a new QCapsuleCollider instance with parent \a parent.
  */
 QCapsuleCollider::QCapsuleCollider(QNode *parent)
-    : QComponent(*new QCapsuleColliderPrivate, parent)
+    : QAbstractCollider(*new QCapsuleColliderPrivate, parent)
 {
 }
 
 /*! \internal */
 QCapsuleCollider::QCapsuleCollider(QCapsuleColliderPrivate &dd, QNode *parent)
-    : QComponent(dd, parent)
+    : QAbstractCollider(dd, parent)
 {
 }
 
diff --git a/src/collision/qcapsulecollider.h b/src/collision/qcapsulecollider.h
index 6c61f182a..eeab609b8 100644
--- a/src/collision/qcapsulecollider.h
+++ b/src/collision/qcapsulecollider.h
@@ -37,7 +37,7 @@
 #ifndef QT3D_QCAPSULECOLLIDER_H
 #define QT3D_QCAPSULECOLLIDER_H
 
-#include <QComponent>
+#include <Qt3DCollision/qabstractcollider.h>
 #include <Qt3DCollision/qt3dcollision_global.h>
 #include <QtGui/qvector3d.h>
 
@@ -47,7 +47,7 @@ namespace Qt3D {
 
 class QCapsuleColliderPrivate;
 
-class QT3DCOLLISIONSHARED_EXPORT QCapsuleCollider : public QComponent
+class QT3DCOLLISIONSHARED_EXPORT QCapsuleCollider : public QAbstractCollider
 {
     Q_OBJECT
     Q_PROPERTY(QVector3D center READ center WRITE setCenter NOTIFY centerChanged)
diff --git a/src/collision/qcapsulecollider_p.h b/src/collision/qcapsulecollider_p.h
index d2b29d035..6f1536267 100644
--- a/src/collision/qcapsulecollider_p.h
+++ b/src/collision/qcapsulecollider_p.h
@@ -37,7 +37,7 @@
 #ifndef QT3D_QCAPSULECOLLIDER_P_H
 #define QT3D_QCAPSULECOLLIDER_P_H
 
-#include <Qt3DCore/private/qcomponent_p.h>
+#include <Qt3DCollision/private/qabstractcollider_p.h>
 #include <QtGui/QVector3D>
 
 QT_BEGIN_NAMESPACE
@@ -46,7 +46,7 @@ namespace Qt3D {
 
 class QCapsuleCollider;
 
-class QCapsuleColliderPrivate : public QComponentPrivate
+class QCapsuleColliderPrivate : public QAbstractColliderPrivate
 {
     QCapsuleColliderPrivate();
 
diff --git a/src/collision/qgeometrycollider.cpp b/src/collision/qgeometrycollider.cpp
index e9414aedc..5d243705b 100644
--- a/src/collision/qgeometrycollider.cpp
+++ b/src/collision/qgeometrycollider.cpp
@@ -46,7 +46,7 @@ namespace Qt3D {
     \internal
 */
 QGeometryColliderPrivate::QGeometryColliderPrivate()
-    : QComponentPrivate()
+    : QAbstractColliderPrivate()
 {
 }
 
@@ -69,13 +69,13 @@ QGeometryColliderPrivate::QGeometryColliderPrivate()
     Constructs a new QGeometryCollider instance with parent \a parent.
  */
 QGeometryCollider::QGeometryCollider(QNode *parent)
-    : QComponent(*new QGeometryColliderPrivate, parent)
+    : QAbstractCollider(*new QGeometryColliderPrivate, parent)
 {
 }
 
 /*! \internal */
 QGeometryCollider::QGeometryCollider(QGeometryColliderPrivate &dd, QNode *parent)
-    : QComponent(dd, parent)
+    : QAbstractCollider(dd, parent)
 {
 }
 
diff --git a/src/collision/qgeometrycollider.h b/src/collision/qgeometrycollider.h
index 1d5fa0a8f..b8961d10a 100644
--- a/src/collision/qgeometrycollider.h
+++ b/src/collision/qgeometrycollider.h
@@ -37,7 +37,7 @@
 #ifndef QT3D_QGEOMETRYCOLLIDER_H
 #define QT3D_QGEOMETRYCOLLIDER_H
 
-#include <QComponent>
+#include <Qt3DCollision/qabstractcollider.h>
 #include <Qt3DCollision/qt3dcollision_global.h>
 #include <QtGui/qvector3d.h>
 
@@ -47,7 +47,7 @@ namespace Qt3D {
 
 class QGeometryColliderPrivate;
 
-class QT3DCOLLISIONSHARED_EXPORT QGeometryCollider : public QComponent
+class QT3DCOLLISIONSHARED_EXPORT QGeometryCollider : public QAbstractCollider
 {
     Q_OBJECT
     // TODO: Add QAbstractGeometry * property to hold the mesh data. Can we reuse functors from render aspect?
diff --git a/src/collision/qgeometrycollider_p.h b/src/collision/qgeometrycollider_p.h
index 979d5e5bd..4f51157d6 100644
--- a/src/collision/qgeometrycollider_p.h
+++ b/src/collision/qgeometrycollider_p.h
@@ -37,7 +37,7 @@
 #ifndef QT3D_QGEOMETRYCOLLIDER_P_H
 #define QT3D_QGEOMETRYCOLLIDER_P_H
 
-#include <Qt3DCore/private/qcomponent_p.h>
+#include <Qt3DCollision/private/qabstractcollider_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,7 +45,7 @@ namespace Qt3D {
 
 class QGeometryCollider;
 
-class QGeometryColliderPrivate : public QComponentPrivate
+class QGeometryColliderPrivate : public QAbstractColliderPrivate
 {
     QGeometryColliderPrivate();
 
diff --git a/src/collision/qspherecollider.cpp b/src/collision/qspherecollider.cpp
index ef3b4a085..1dc977fa5 100644
--- a/src/collision/qspherecollider.cpp
+++ b/src/collision/qspherecollider.cpp
@@ -46,7 +46,7 @@ namespace Qt3D {
     \internal
 */
 QSphereColliderPrivate::QSphereColliderPrivate()
-    : QComponentPrivate()
+    : QAbstractColliderPrivate()
     , m_center()
     , m_radius(1.0f)
 {
@@ -71,13 +71,13 @@ QSphereColliderPrivate::QSphereColliderPrivate()
     Constructs a new QSphereCollider instance with parent \a parent.
  */
 QSphereCollider::QSphereCollider(QNode *parent)
-    : QComponent(*new QSphereColliderPrivate, parent)
+    : QAbstractCollider(*new QSphereColliderPrivate, parent)
 {
 }
 
 /*! \internal */
 QSphereCollider::QSphereCollider(QSphereColliderPrivate &dd, QNode *parent)
-    : QComponent(dd, parent)
+    : QAbstractCollider(dd, parent)
 {
 }
 
diff --git a/src/collision/qspherecollider.h b/src/collision/qspherecollider.h
index 43a4bfbd7..20c2e0595 100644
--- a/src/collision/qspherecollider.h
+++ b/src/collision/qspherecollider.h
@@ -37,7 +37,7 @@
 #ifndef QT3D_QCOLLISIONCOMPONENT_H
 #define QT3D_QCOLLISIONCOMPONENT_H
 
-#include <Qt3DCore/qcomponent.h>
+#include <Qt3DCollision/qabstractcollider.h>
 #include <Qt3DCollision/qt3dcollision_global.h>
 #include <QtGui/qvector3d.h>
 
@@ -47,7 +47,7 @@ namespace Qt3D {
 
 class QSphereColliderPrivate;
 
-class QT3DCOLLISIONSHARED_EXPORT QSphereCollider : public QComponent
+class QT3DCOLLISIONSHARED_EXPORT QSphereCollider : public QAbstractCollider
 {
     Q_OBJECT
     Q_PROPERTY(QVector3D center READ center WRITE setCenter NOTIFY centerChanged)
diff --git a/src/collision/qspherecollider_p.h b/src/collision/qspherecollider_p.h
index 8d190b7a8..e97152cfe 100644
--- a/src/collision/qspherecollider_p.h
+++ b/src/collision/qspherecollider_p.h
@@ -37,7 +37,7 @@
 #ifndef QT3D_COLLISION_QSPHERECOLLIDER_P_H
 #define QT3D_COLLISION_QSPHERECOLLIDER_P_H
 
-#include <private/qcomponent_p.h>
+#include <Qt3DCollision/private/qabstractcollider_p.h>
 #include <QtGui/qvector3d.h>
 
 QT_BEGIN_NAMESPACE
@@ -46,7 +46,7 @@ namespace Qt3D {
 
 class QSphereCollider;
 
-class QSphereColliderPrivate : public QComponentPrivate
+class QSphereColliderPrivate : public QAbstractColliderPrivate
 {
 public:
     QSphereColliderPrivate();