13 files changed, 66 insertions, 66 deletions
diff --git a/examples/qt3d/materials-cpp/barrel.cpp b/examples/qt3d/materials-cpp/barrel.cpp
index c89b58d52..fc86a9ab2 100644
--- a/examples/qt3d/materials-cpp/barrel.cpp
+++ b/examples/qt3d/materials-cpp/barrel.cpp
@@ -57,7 +57,7 @@ const char *bumpsName[] = {
     "hard_bumps"
 };
 
-Barrel::Barrel(Qt3D::QNode *parent)
+Barrel::Barrel(Qt3DCore::QNode *parent)
     : RenderableEntity(parent)
     , m_bumps(NoBumps)
     , m_diffuseColor(Red)
diff --git a/examples/qt3d/materials-cpp/barrel.h b/examples/qt3d/materials-cpp/barrel.h
index 0a8b81bde..c439d1a85 100644
--- a/examples/qt3d/materials-cpp/barrel.h
+++ b/examples/qt3d/materials-cpp/barrel.h
@@ -44,7 +44,7 @@
 class Barrel : public RenderableEntity
 {
 public:
-    Barrel(Qt3D::QNode *parent = 0);
+    Barrel(Qt3DCore::QNode *parent = 0);
     ~Barrel();
 
     enum DiffuseColor {
diff --git a/examples/qt3d/materials-cpp/houseplant.cpp b/examples/qt3d/materials-cpp/houseplant.cpp
index df1384486..81d0ab0d2 100644
--- a/examples/qt3d/materials-cpp/houseplant.cpp
+++ b/examples/qt3d/materials-cpp/houseplant.cpp
@@ -53,8 +53,8 @@ const char *plantNames[] = {
 };
 
 
-HousePlant::HousePlant(Qt3D::QNode *parent)
-    : Qt3D::QEntity(parent)
+HousePlant::HousePlant(Qt3DCore::QNode *parent)
+    : Qt3DCore::QEntity(parent)
     , m_pot(new RenderableEntity(this))
     , m_plant(new RenderableEntity(m_pot))
     , m_cover(new RenderableEntity(m_pot))
diff --git a/examples/qt3d/materials-cpp/houseplant.h b/examples/qt3d/materials-cpp/houseplant.h
index 36cb6ca23..a49326dbd 100644
--- a/examples/qt3d/materials-cpp/houseplant.h
+++ b/examples/qt3d/materials-cpp/houseplant.h
@@ -43,11 +43,11 @@
 #include <QNormalDiffuseMapMaterial>
 #include <QTextureImage>
 
-class HousePlant : public Qt3D::QEntity
+class HousePlant : public Qt3DCore::QEntity
 {
     Q_OBJECT
 public:
-    explicit HousePlant(Qt3D::QNode *parent = 0);
+    explicit HousePlant(Qt3DCore::QNode *parent = 0);
     ~HousePlant();
 
     enum PotShape {
diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp
index f18f1f32a..b2e08b7fa 100644
--- a/examples/qt3d/materials-cpp/main.cpp
+++ b/examples/qt3d/materials-cpp/main.cpp
@@ -60,7 +60,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::QAspectEngine engine;
+    Qt3DCore::QAspectEngine engine;
     engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
@@ -71,11 +71,11 @@ int main(int argc, char* argv[])
     engine.setData(data);
 
     // Scene Root
-    Qt3D::QEntity *sceneRoot = new Qt3D::QEntity();
+    Qt3DCore::QEntity *sceneRoot = new Qt3DCore::QEntity();
 
     // Scene Camera
-    Qt3D::QCamera *basicCamera = new Qt3D::QCamera(sceneRoot);
-    basicCamera->setProjectionType(Qt3D::QCameraLens::PerspectiveProjection);
+    Qt3DCore::QCamera *basicCamera = new Qt3DCore::QCamera(sceneRoot);
+    basicCamera->setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection);
     basicCamera->setAspectRatio(view.width() / view.height());
     basicCamera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f));
     basicCamera->setViewCenter(QVector3D(0.0f, 3.5f, 0.0f));
diff --git a/examples/qt3d/materials-cpp/planeentity.cpp b/examples/qt3d/materials-cpp/planeentity.cpp
index 3a06bded7..b8a400232 100644
--- a/examples/qt3d/materials-cpp/planeentity.cpp
+++ b/examples/qt3d/materials-cpp/planeentity.cpp
@@ -41,12 +41,12 @@
 #include <Qt3DCore/QScaleTransform>
 #include <Qt3DCore/QTranslateTransform>
 
-PlaneEntity::PlaneEntity(Qt3D::QNode *parent)
-    : Qt3D::QEntity(new Qt3D::QEntity(parent))
+PlaneEntity::PlaneEntity(Qt3DCore::QNode *parent)
+    : Qt3DCore::QEntity(new Qt3DCore::QEntity(parent))
     , m_mesh(new Qt3DRender::QPlaneMesh())
-    , m_transform(new Qt3D::QTransform())
-    , m_scaleTransform(new Qt3D::QScaleTransform())
-    , m_translateTransform(new Qt3D::QTranslateTransform())
+    , m_transform(new Qt3DCore::QTransform())
+    , m_scaleTransform(new Qt3DCore::QScaleTransform())
+    , m_translateTransform(new Qt3DCore::QTranslateTransform())
 {
     m_transform->addTransform(m_translateTransform);
     m_transform->addTransform(m_scaleTransform);
@@ -58,12 +58,12 @@ PlaneEntity::~PlaneEntity()
 {
 }
 
-Qt3D::QScaleTransform *PlaneEntity::scaleTransform() const
+Qt3DCore::QScaleTransform *PlaneEntity::scaleTransform() const
 {
     return m_scaleTransform;
 }
 
-Qt3D::QTranslateTransform *PlaneEntity::translateTransform() const
+Qt3DCore::QTranslateTransform *PlaneEntity::translateTransform() const
 {
     return m_translateTransform;
 }
diff --git a/examples/qt3d/materials-cpp/planeentity.h b/examples/qt3d/materials-cpp/planeentity.h
index 48639b306..1b6f49d69 100644
--- a/examples/qt3d/materials-cpp/planeentity.h
+++ b/examples/qt3d/materials-cpp/planeentity.h
@@ -43,21 +43,21 @@
 #include <Qt3DCore/QTranslateTransform>
 #include <Qt3DRenderer/QPlaneMesh>
 
-class PlaneEntity : public Qt3D::QEntity
+class PlaneEntity : public Qt3DCore::QEntity
 {
 public:
-    PlaneEntity(Qt3D::QNode *parent = 0);
+    PlaneEntity(Qt3DCore::QNode *parent = 0);
     ~PlaneEntity();
 
-    Qt3D::QScaleTransform *scaleTransform() const;
-    Qt3D::QTranslateTransform *translateTransform() const;
+    Qt3DCore::QScaleTransform *scaleTransform() const;
+    Qt3DCore::QTranslateTransform *translateTransform() const;
     Qt3DRender::QPlaneMesh *mesh() const;
 
 private:
     Qt3DRender::QPlaneMesh *m_mesh;
-    Qt3D::QTransform *m_transform;
-    Qt3D::QScaleTransform *m_scaleTransform;
-    Qt3D::QTranslateTransform *m_translateTransform;
+    Qt3DCore::QTransform *m_transform;
+    Qt3DCore::QScaleTransform *m_scaleTransform;
+    Qt3DCore::QTranslateTransform *m_translateTransform;
 };
 
 #endif // PLANEENTITY_H
diff --git a/examples/qt3d/materials-cpp/renderableentity.cpp b/examples/qt3d/materials-cpp/renderableentity.cpp
index 2e463a607..1d100c686 100644
--- a/examples/qt3d/materials-cpp/renderableentity.cpp
+++ b/examples/qt3d/materials-cpp/renderableentity.cpp
@@ -36,13 +36,13 @@
 
 #include "renderableentity.h"
 
-RenderableEntity::RenderableEntity(Qt3D::QNode *parent)
-    : Qt3D::QEntity(parent)
+RenderableEntity::RenderableEntity(Qt3DCore::QNode *parent)
+    : Qt3DCore::QEntity(parent)
     , m_mesh(new Qt3DRender::QMesh())
-    , m_transform(new Qt3D::QTransform())
-    , m_rotateTransform(new Qt3D::QRotateTransform())
-    , m_scaleTransform(new Qt3D::QScaleTransform())
-    , m_translateTransform(new Qt3D::QTranslateTransform())
+    , m_transform(new Qt3DCore::QTransform())
+    , m_rotateTransform(new Qt3DCore::QRotateTransform())
+    , m_scaleTransform(new Qt3DCore::QScaleTransform())
+    , m_translateTransform(new Qt3DCore::QTranslateTransform())
 {
     m_transform->addTransform(m_rotateTransform);
     m_transform->addTransform(m_scaleTransform);
@@ -61,17 +61,17 @@ Qt3DRender::QMesh *RenderableEntity::mesh() const
     return m_mesh;
 }
 
-Qt3D::QScaleTransform *RenderableEntity::scaleTransform() const
+Qt3DCore::QScaleTransform *RenderableEntity::scaleTransform() const
 {
     return m_scaleTransform;
 }
 
-Qt3D::QTranslateTransform *RenderableEntity::translateTransform() const
+Qt3DCore::QTranslateTransform *RenderableEntity::translateTransform() const
 {
     return m_translateTransform;
 }
 
-Qt3D::QRotateTransform *RenderableEntity::rotateTransform() const
+Qt3DCore::QRotateTransform *RenderableEntity::rotateTransform() const
 {
     return m_rotateTransform;
 }
diff --git a/examples/qt3d/materials-cpp/renderableentity.h b/examples/qt3d/materials-cpp/renderableentity.h
index 216ad843f..4a6397f9d 100644
--- a/examples/qt3d/materials-cpp/renderableentity.h
+++ b/examples/qt3d/materials-cpp/renderableentity.h
@@ -44,23 +44,23 @@
 #include <Qt3DCore/QTranslateTransform>
 #include <Qt3DRenderer/QMesh>
 
-class RenderableEntity : public Qt3D::QEntity
+class RenderableEntity : public Qt3DCore::QEntity
 {
 public:
-    RenderableEntity(Qt3D::QNode *parent = 0);
+    RenderableEntity(Qt3DCore::QNode *parent = 0);
     ~RenderableEntity();
 
     Qt3DRender::QMesh *mesh() const;
-    Qt3D::QScaleTransform *scaleTransform() const;
-    Qt3D::QTranslateTransform *translateTransform() const;
-    Qt3D::QRotateTransform *rotateTransform() const;
+    Qt3DCore::QScaleTransform *scaleTransform() const;
+    Qt3DCore::QTranslateTransform *translateTransform() const;
+    Qt3DCore::QRotateTransform *rotateTransform() const;
 
 private:
     Qt3DRender::QMesh *m_mesh;
-    Qt3D::QTransform *m_transform;
-    Qt3D::QRotateTransform *m_rotateTransform;
-    Qt3D::QScaleTransform *m_scaleTransform;
-    Qt3D::QTranslateTransform *m_translateTransform;
+    Qt3DCore::QTransform *m_transform;
+    Qt3DCore::QRotateTransform *m_rotateTransform;
+    Qt3DCore::QScaleTransform *m_scaleTransform;
+    Qt3DCore::QTranslateTransform *m_translateTransform;
 };
 
 #endif // RENDERABLEENTITY_H
diff --git a/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp b/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp
index 833d82d37..b27abcd36 100644
--- a/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp
+++ b/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp
@@ -36,7 +36,7 @@
 
 #include "rotatingtrefoilknot.h"
 
-RotatingTrefoilKnot::RotatingTrefoilKnot(Qt3D::QNode *parent)
+RotatingTrefoilKnot::RotatingTrefoilKnot(Qt3DCore::QNode *parent)
     : TrefoilKnot(parent)
     , m_thetaAnimation(new QPropertyAnimation(this))
     , m_phiAnimation(new QPropertyAnimation(this))
diff --git a/examples/qt3d/materials-cpp/rotatingtrefoilknot.h b/examples/qt3d/materials-cpp/rotatingtrefoilknot.h
index 231ce5270..397aa1705 100644
--- a/examples/qt3d/materials-cpp/rotatingtrefoilknot.h
+++ b/examples/qt3d/materials-cpp/rotatingtrefoilknot.h
@@ -43,7 +43,7 @@
 class RotatingTrefoilKnot : public TrefoilKnot
 {
 public:
-    explicit RotatingTrefoilKnot(Qt3D::QNode *parent = 0);
+    explicit RotatingTrefoilKnot(Qt3DCore::QNode *parent = 0);
     ~RotatingTrefoilKnot();
 
 private:
diff --git a/examples/qt3d/materials-cpp/trefoilknot.cpp b/examples/qt3d/materials-cpp/trefoilknot.cpp
index d71c9944d..610a972bd 100644
--- a/examples/qt3d/materials-cpp/trefoilknot.cpp
+++ b/examples/qt3d/materials-cpp/trefoilknot.cpp
@@ -36,14 +36,14 @@
 
 #include "trefoilknot.h"
 
-TrefoilKnot::TrefoilKnot(Qt3D::QNode *parent)
-    : Qt3D::QEntity(parent)
+TrefoilKnot::TrefoilKnot(Qt3DCore::QNode *parent)
+    : Qt3DCore::QEntity(parent)
     , m_mesh(new Qt3DRender::QMesh())
-    , m_transform(new Qt3D::QTransform())
-    , m_scaleTransform(new Qt3D::QScaleTransform())
-    , m_xaxisRotation(new Qt3D::QRotateTransform())
-    , m_yaxisRotation(new Qt3D::QRotateTransform())
-    , m_translateTransform(new Qt3D::QTranslateTransform())
+    , m_transform(new Qt3DCore::QTransform())
+    , m_scaleTransform(new Qt3DCore::QScaleTransform())
+    , m_xaxisRotation(new Qt3DCore::QRotateTransform())
+    , m_yaxisRotation(new Qt3DCore::QRotateTransform())
+    , m_translateTransform(new Qt3DCore::QTranslateTransform())
 {
     m_mesh->setSource(QUrl("qrc:/assets/obj/trefoil.obj"));
     m_xaxisRotation->setAxis(QVector3D(1.0f, 0.0f, 0.0f));
@@ -62,22 +62,22 @@ TrefoilKnot::~TrefoilKnot()
 {
 }
 
-Qt3D::QScaleTransform *TrefoilKnot::scaleTransform() const
+Qt3DCore::QScaleTransform *TrefoilKnot::scaleTransform() const
 {
     return m_scaleTransform;
 }
 
-Qt3D::QRotateTransform *TrefoilKnot::xaxisRotateTransform() const
+Qt3DCore::QRotateTransform *TrefoilKnot::xaxisRotateTransform() const
 {
     return m_xaxisRotation;
 }
 
-Qt3D::QRotateTransform *TrefoilKnot::yaxisRotateTransform() const
+Qt3DCore::QRotateTransform *TrefoilKnot::yaxisRotateTransform() const
 {
     return m_yaxisRotation;
 }
 
-Qt3D::QTranslateTransform *TrefoilKnot::translateTransform() const
+Qt3DCore::QTranslateTransform *TrefoilKnot::translateTransform() const
 {
     return m_translateTransform;
 }
diff --git a/examples/qt3d/materials-cpp/trefoilknot.h b/examples/qt3d/materials-cpp/trefoilknot.h
index 6beda9cd1..bac6e59b0 100644
--- a/examples/qt3d/materials-cpp/trefoilknot.h
+++ b/examples/qt3d/materials-cpp/trefoilknot.h
@@ -44,24 +44,24 @@
 #include <Qt3DCore/QTranslateTransform>
 #include <Qt3DRenderer/QMesh>
 
-class TrefoilKnot : public Qt3D::QEntity
+class TrefoilKnot : public Qt3DCore::QEntity
 {
 public:
-    explicit TrefoilKnot(Qt3D::QNode *parent = 0);
+    explicit TrefoilKnot(Qt3DCore::QNode *parent = 0);
     ~TrefoilKnot();
 
-    Qt3D::QScaleTransform *scaleTransform() const;
-    Qt3D::QRotateTransform *xaxisRotateTransform() const;
-    Qt3D::QRotateTransform *yaxisRotateTransform() const;
-    Qt3D::QTranslateTransform *translateTransform() const;
+    Qt3DCore::QScaleTransform *scaleTransform() const;
+    Qt3DCore::QRotateTransform *xaxisRotateTransform() const;
+    Qt3DCore::QRotateTransform *yaxisRotateTransform() const;
+    Qt3DCore::QTranslateTransform *translateTransform() const;
 
 private:
     Qt3DRender::QMesh *m_mesh;
-    Qt3D::QTransform *m_transform;
-    Qt3D::QScaleTransform *m_scaleTransform;
-    Qt3D::QRotateTransform *m_xaxisRotation;
-    Qt3D::QRotateTransform *m_yaxisRotation;
-    Qt3D::QTranslateTransform *m_translateTransform;
+    Qt3DCore::QTransform *m_transform;
+    Qt3DCore::QScaleTransform *m_scaleTransform;
+    Qt3DCore::QRotateTransform *m_xaxisRotation;
+    Qt3DCore::QRotateTransform *m_yaxisRotation;
+    Qt3DCore::QTranslateTransform *m_translateTransform;
 };
 
 #endif // TREFOILKNOT_H