Renamed Camera to QCamera

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

3 files changed, 4 insertions, 4 deletions

diff --git a/src/render/io/assimpparser.h b/src/render/io/assimpparser.h
index 61a22c7d7..6ead76383 100644
--- a/src/render/io/assimpparser.h
+++ b/src/render/io/assimpparser.h
@@ -64,7 +64,7 @@ namespace Qt3D {
 class QMaterial;
 class ShaderProgram;
 class QEffect;
-class Camera;
+class QCamera;
 class Texture;
 class QMesh;
 
@@ -86,7 +86,7 @@ public:
     QEntity *defaultScene();
     MeshDataPtr mesh(QString id);
     QMaterial *material(QString id);
-    Camera *camera(QString id);
+    QCamera *camera(QString id);
 
 private :
 
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index 58a9d33d8..c8a0ca143 100644
--- a/src/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
@@ -50,7 +50,7 @@
 #include <qtechnique.h>
 #include <shaderprogram.h>
 #include <qeffect.h>
-#include <Qt3DCore/camera.h>
+#include <Qt3DCore/qcamera.h>
 #include <Qt3DCore/qtransform.h>
 #include <Qt3DCore/qmatrixtransform.h>
 #include <Qt3DCore/qcameralens.h>
diff --git a/src/render/io/gltfparser.h b/src/render/io/gltfparser.h
index 21b940e84..57ac2248c 100644
--- a/src/render/io/gltfparser.h
+++ b/src/render/io/gltfparser.h
@@ -63,7 +63,7 @@ namespace Qt3D {
 class QMaterial;
 class ShaderProgram;
 class QEffect;
-class Camera;
+class QCamera;
 class QCameraLens;
 class Texture;