Renamed Transform to QTransform

Change-Id: Ic7ee353afbc8872f5f5a85662acc190ccae4d178
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

6 files changed, 15 insertions, 15 deletions

diff --git a/src/render/backend/rendercamera.cpp b/src/render/backend/rendercamera.cpp
index 7cbdba033..485ef1002 100644
--- a/src/render/backend/rendercamera.cpp
+++ b/src/render/backend/rendercamera.cpp
@@ -43,7 +43,7 @@
 #include "rendereraspect.h"
 #include "renderlogging.h"
 
-#include <Qt3DCore/transform.h>
+#include <Qt3DCore/qtransform.h>
 #include <Qt3DCore/cameralens.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qaspectmanager.h>
diff --git a/src/render/backend/renderentity.cpp b/src/render/backend/renderentity.cpp
index e6c82ea08..ca96472fb 100644
--- a/src/render/backend/renderentity.cpp
+++ b/src/render/backend/renderentity.cpp
@@ -56,7 +56,7 @@
 #include <Qt3DCore/cameralens.h>
 #include <Qt3DCore/qaspectmanager.h>
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DCore/transform.h>
+#include <Qt3DCore/qtransform.h>
 
 #include <QMatrix4x4>
 #include <QString>
@@ -123,7 +123,7 @@ void RenderEntity::setPeer(QEntity *peer)
     }
 }
 
-void RenderEntity::setTransform(Transform *transform)
+void RenderEntity::setTransform(QTransform *transform)
 {
     if (transform != m_transform) {
         QChangeArbiter *arbiter = m_renderer->rendererAspect()->aspectManager()->changeArbiter();
@@ -167,8 +167,8 @@ void RenderEntity::sceneChangeEvent(const QSceneChangePtr &e)
     case ComponentAdded: {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
         QComponent *component = propertyChange->m_value.value<QComponent*>();
-        if (m_transform == Q_NULLPTR && qobject_cast<Transform*>(component) != Q_NULLPTR) {
-            setTransform(qobject_cast<Transform *>(component));
+        if (m_transform == Q_NULLPTR && qobject_cast<QTransform*>(component) != Q_NULLPTR) {
+            setTransform(qobject_cast<QTransform *>(component));
         }
         else if (qobject_cast<CameraLens *>(component)) {
             RenderCamera *cam = m_renderer->cameraManager()->lookupResource(m_frontEndPeer->asEntity()->uuid());
diff --git a/src/render/backend/renderentity.h b/src/render/backend/renderentity.h
index d6f7f4551..6eb8f4b2c 100644
--- a/src/render/backend/renderentity.h
+++ b/src/render/backend/renderentity.h
@@ -56,7 +56,7 @@ class RendererAspect;
 class Sphere;
 class QNode;
 class QEntity;
-class Transform;
+class QTransform;
 
 typedef QHandle<QMatrix4x4, 16> HMatrix;
 
@@ -76,7 +76,7 @@ public:
     RenderEntity();
     ~RenderEntity();
 
-    void setTransform(Transform *transform);
+    void setTransform(QTransform *transform);
     void setParentHandle(HRenderNode parentHandle);
     void setRenderer(Renderer *renderer);
     void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
@@ -102,7 +102,7 @@ public:
 private:
 
     Renderer *m_renderer;
-    Transform *m_transform;
+    QTransform *m_transform;
     HRenderNode m_handle;
     HRenderNode m_parentHandle;
     QVector<HRenderNode > m_childrenHandles;
diff --git a/src/render/backend/renderscenebuilder.cpp b/src/render/backend/renderscenebuilder.cpp
index a394a9656..c5863af36 100644
--- a/src/render/backend/renderscenebuilder.cpp
+++ b/src/render/backend/renderscenebuilder.cpp
@@ -76,7 +76,7 @@
 
 #include <Qt3DCore/camera.h>
 #include <Qt3DCore/cameralens.h>
-#include <Qt3DCore/transform.h>
+#include <Qt3DCore/qtransform.h>
 #include <Qt3DCore/qentity.h>
 
 QT_BEGIN_NAMESPACE
@@ -233,7 +233,7 @@ HRenderNode RenderSceneBuilder::createRenderNode(QEntity *entity)
     renderNode->setRenderer(m_renderer);
     renderNode->setPeer(entity);
 
-    QList<Transform *> transforms = entity->componentsOfType<Transform>();
+    QList<QTransform *> transforms = entity->componentsOfType<QTransform>();
     if (!transforms.isEmpty())
         renderNode->setTransform(transforms.first());
 
diff --git a/src/render/io/assimpparser.cpp b/src/render/io/assimpparser.cpp
index edaea3ecb..d810085c3 100644
--- a/src/render/io/assimpparser.cpp
+++ b/src/render/io/assimpparser.cpp
@@ -41,7 +41,7 @@
 
 #include "assimpparser.h"
 
-#include <Qt3DCore/transform.h>
+#include <Qt3DCore/qtransform.h>
 #include <parameter.h>
 #include <Qt3DCore/matrixtransform.h>
 #include <Qt3DCore/cameralens.h>
@@ -312,7 +312,7 @@ QEntity *AssimpParser::node(aiNode *node)
     }
 
     // Add Transformations
-    Transform *transform = new Transform();
+    QTransform *transform = new QTransform();
     QMatrix4x4 qTransformMatrix = AssimpParser::aiMatrix4x4ToQMatrix4x4(node->mTransformation);
     transform->setMatrix(qTransformMatrix);
     entityNode->addComponent(transform);
@@ -612,7 +612,7 @@ void AssimpParser::loadCamera(uint cameraIndex)
     // View Matrix defines camera position & up vector relative to the associated
     // node in the scene. This is computed in AssimpParser::node
     //    camera->lookAt()->setViewMatrix();
-    Transform *transform = new Transform();
+    QTransform *transform = new QTransform();
     QMatrix4x4 viewMatrix = AssimpParser::aiMatrix4x4ToQMatrix4x4(cm);
     // CHECK THAT THIS WORKS
     qCDebug(Render::Io) << Q_FUNC_INFO << "IF CAMERA NOT BEHAVING CORRECTLY LOOK HERE";
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index 901afc02e..2dabddda9 100644
--- a/src/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
@@ -51,7 +51,7 @@
 #include <shaderprogram.h>
 #include <qeffect.h>
 #include <Qt3DCore/camera.h>
-#include <Qt3DCore/transform.h>
+#include <Qt3DCore/qtransform.h>
 #include <Qt3DCore/matrixtransform.h>
 #include <Qt3DCore/cameralens.h>
 #include <texture.h>
@@ -388,7 +388,7 @@ QEntity* GLTFParser::node(QString id)
         }
 
         // ADD MATRIX TRANSFORM COMPONENT TO ENTITY
-        Transform *trans = new Transform();
+        QTransform *trans = new QTransform();
         trans->appendTransform(new MatrixTransform(m));
         result->addComponent(trans);
     }