Move Qt3DCore into Qt3DCore namespace

Update other aspects, tests and examples accordingly.

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

3 files changed, 28 insertions, 28 deletions

diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp
index 19da31f00..9bddbd314 100644
--- a/examples/qt3d/basicshapes-cpp/main.cpp
+++ b/examples/qt3d/basicshapes-cpp/main.cpp
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
 
     widget->setWindowTitle(QStringLiteral("Basic shapes"));
 
-    Qt3D::QAspectEngine engine;
+    Qt3DCore::QAspectEngine engine;
     engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
@@ -100,10 +100,10 @@ int main(int argc, char **argv)
     engine.setData(data);
 
     // Root entity
-    Qt3D::QEntity *rootEntity = new Qt3D::QEntity();
+    Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
 
     // Camera
-    Qt3D::QCamera *cameraEntity = new Qt3D::QCamera(rootEntity);
+    Qt3DCore::QCamera *cameraEntity = new Qt3DCore::QCamera(rootEntity);
     cameraEntity->setObjectName(QStringLiteral("cameraEntity"));
 
     cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f);
diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
index 97d8ad4be..d67e70902 100644
--- a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
+++ b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
@@ -38,7 +38,7 @@
 
 #include <QtCore/QDebug>
 
-SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
+SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity)
     : m_rootEntity(rootEntity)
 {
 
@@ -53,10 +53,10 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
 
     // TorusMesh Transform
     //! [1]
-    Qt3D::QScaleTransform *torusScale = new Qt3D::QScaleTransform();
-    Qt3D::QTranslateTransform *torusTranslation = new Qt3D::QTranslateTransform();
-    Qt3D::QRotateTransform *torusRotation = new Qt3D::QRotateTransform();
-    Qt3D::QTransform *torusTransforms = new Qt3D::QTransform();
+    Qt3DCore::QScaleTransform *torusScale = new Qt3DCore::QScaleTransform();
+    Qt3DCore::QTranslateTransform *torusTranslation = new Qt3DCore::QTranslateTransform();
+    Qt3DCore::QRotateTransform *torusRotation = new Qt3DCore::QRotateTransform();
+    Qt3DCore::QTransform *torusTransforms = new Qt3DCore::QTransform();
 
     torusScale->setScale3D(QVector3D(2.0f, 2.0f, 2.0f));
     torusTranslation->setTranslation(QVector3D(1.7f, 1.7f, 0.0f));
@@ -75,7 +75,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
 
     // Torus
     //! [3]
-    m_torusEntity = new Qt3D::QEntity(m_rootEntity);
+    m_torusEntity = new Qt3DCore::QEntity(m_rootEntity);
     m_torusEntity->addComponent(m_torus);
     m_torusEntity->addComponent(torusMaterial);
     m_torusEntity->addComponent(torusTransforms);
@@ -89,10 +89,10 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     cylinder->setSlices(20);
 
     // CylinderMesh Transform
-    Qt3D::QScaleTransform *cylinderScale = new Qt3D::QScaleTransform();
-    Qt3D::QRotateTransform *cylinderRotation = new Qt3D::QRotateTransform();
-    Qt3D::QTranslateTransform *cylinderTranslation = new Qt3D::QTranslateTransform();
-    Qt3D::QTransform *cylinderTransforms = new Qt3D::QTransform();
+    Qt3DCore::QScaleTransform *cylinderScale = new Qt3DCore::QScaleTransform();
+    Qt3DCore::QRotateTransform *cylinderRotation = new Qt3DCore::QRotateTransform();
+    Qt3DCore::QTranslateTransform *cylinderTranslation = new Qt3DCore::QTranslateTransform();
+    Qt3DCore::QTransform *cylinderTransforms = new Qt3DCore::QTransform();
 
     cylinderScale->setScale3D(QVector3D(1.5f, 1.5f, 1.5f));
     cylinderTranslation->setTranslation(QVector3D(-2.6f, 2.4f, -1.5));
@@ -107,7 +107,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     cylinderMaterial->setDiffuse(QColor(QRgb(0x928327)));
 
     // Cylinder
-    m_cylinderEntity = new Qt3D::QEntity(m_rootEntity);
+    m_cylinderEntity = new Qt3DCore::QEntity(m_rootEntity);
     m_cylinderEntity->addComponent(cylinder);
     m_cylinderEntity->addComponent(cylinderMaterial);
     m_cylinderEntity->addComponent(cylinderTransforms);
@@ -116,9 +116,9 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     Qt3DRender::QCuboidMesh *cuboid = new Qt3DRender::QCuboidMesh();
 
     // CuboidMesh Transform
-    Qt3D::QScaleTransform *cuboidScale = new Qt3D::QScaleTransform();
-    Qt3D::QTranslateTransform *cuboidTranslation = new Qt3D::QTranslateTransform();
-    Qt3D::QTransform *cuboidTransforms = new Qt3D::QTransform();
+    Qt3DCore::QScaleTransform *cuboidScale = new Qt3DCore::QScaleTransform();
+    Qt3DCore::QTranslateTransform *cuboidTranslation = new Qt3DCore::QTranslateTransform();
+    Qt3DCore::QTransform *cuboidTransforms = new Qt3DCore::QTransform();
 
     cuboidScale->setScale3D(QVector3D(4.0f, 4.0f, 4.0f));
     cuboidTranslation->setTranslation(QVector3D(0.9f, -0.9f, 0.0f));
@@ -130,7 +130,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     cuboidMaterial->setDiffuse(QColor(QRgb(0x665423)));
 
     //Cuboid
-    m_cuboidEntity = new Qt3D::QEntity(m_rootEntity);
+    m_cuboidEntity = new Qt3DCore::QEntity(m_rootEntity);
     m_cuboidEntity->addComponent(cuboid);
     m_cuboidEntity->addComponent(cuboidMaterial);
     m_cuboidEntity->addComponent(cuboidTransforms);
@@ -142,9 +142,9 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     sphereMesh->setRadius(2);
 
     // Sphere mesh transform
-    Qt3D::QScaleTransform *sphereScale = new Qt3D::QScaleTransform();
-    Qt3D::QTranslateTransform *sphereTranslation = new Qt3D::QTranslateTransform();
-    Qt3D::QTransform *sphereTransforms = new Qt3D::QTransform();
+    Qt3DCore::QScaleTransform *sphereScale = new Qt3DCore::QScaleTransform();
+    Qt3DCore::QTranslateTransform *sphereTranslation = new Qt3DCore::QTranslateTransform();
+    Qt3DCore::QTransform *sphereTransforms = new Qt3DCore::QTransform();
 
     sphereScale->setScale3D(QVector3D(1.3f, 1.3f, 1.3f));
     sphereTranslation->setTranslation(QVector3D(-2.9f, -2.9f, 0.0f));
@@ -156,7 +156,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     sphereMaterial->setDiffuse(QColor(QRgb(0xa69929)));
 
     // Sphere
-    m_sphereEntity = new Qt3D::QEntity(m_rootEntity);
+    m_sphereEntity = new Qt3DCore::QEntity(m_rootEntity);
     m_sphereEntity->addComponent(sphereMesh);
     m_sphereEntity->addComponent(sphereMaterial);
     m_sphereEntity->addComponent(sphereTransforms);
diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.h b/examples/qt3d/basicshapes-cpp/scenemodifier.h
index c85e3e4fb..f108298ac 100644
--- a/examples/qt3d/basicshapes-cpp/scenemodifier.h
+++ b/examples/qt3d/basicshapes-cpp/scenemodifier.h
@@ -56,7 +56,7 @@ class SceneModifier : public QObject
     Q_OBJECT
 
 public:
-    explicit SceneModifier(Qt3D::QEntity *rootEntity);
+    explicit SceneModifier(Qt3DCore::QEntity *rootEntity);
     ~SceneModifier();
 
 public slots:
@@ -66,12 +66,12 @@ public slots:
     void enableSphere(bool enabled);
 
 private:
-    Qt3D::QEntity *m_rootEntity;
+    Qt3DCore::QEntity *m_rootEntity;
     Qt3DRender::QTorusMesh *m_torus;
-    Qt3D::QEntity *m_cylinderEntity;
-    Qt3D::QEntity *m_torusEntity;
-    Qt3D::QEntity *m_cuboidEntity;
-    Qt3D::QEntity *m_sphereEntity;
+    Qt3DCore::QEntity *m_cylinderEntity;
+    Qt3DCore::QEntity *m_torusEntity;
+    Qt3DCore::QEntity *m_cuboidEntity;
+    Qt3DCore::QEntity *m_sphereEntity;
 };
 
 #endif // SCENEMODIFIER_H