From c8789b3b7651d2014b7a646cca3c3f0dc68f2967 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Tue, 8 Jul 2014 16:25:20 +0200
Subject: Renamed CameraLens to QCameraLens

Change-Id: I3436d48f08f5eb29fd821538d9d88e12a48a305a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/render/io/gltfparser.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/render/io/gltfparser.cpp')

diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index df5b65fec..58a9d33d8 100644
--- a/src/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
@@ -53,7 +53,7 @@
 #include <Qt3DCore/camera.h>
 #include <Qt3DCore/qtransform.h>
 #include <Qt3DCore/qmatrixtransform.h>
-#include <Qt3DCore/cameralens.h>
+#include <Qt3DCore/qcameralens.h>
 #include <texture.h>
 #include <qparameter.h>
 
@@ -395,7 +395,7 @@ QEntity* GLTFParser::node(QString id)
 
     if ( jsonObj.contains(KEY_CAMERA) )
     {
-        CameraLens* cam = camera( jsonObj.value(KEY_CAMERA).toString() );
+        QCameraLens* cam = camera( jsonObj.value(KEY_CAMERA).toString() );
         if (!cam) {
             qWarning() << "failed to build camera:" << jsonObj.value(KEY_CAMERA)
                        << "on node" << id;
@@ -416,7 +416,7 @@ QEntity* GLTFParser::node(QString id)
 #undef far
 #endif
 
-CameraLens* GLTFParser::camera(QString id)
+QCameraLens* GLTFParser::camera(QString id)
 {
     parse();
     QJsonObject cams = m_json.object().value(KEY_CAMERAS).toObject();
@@ -439,7 +439,7 @@ CameraLens* GLTFParser::camera(QString id)
         double near = pObj.value(KEY_ZNEAR).toDouble();
         double far = pObj.value(KEY_ZFAR).toDouble();
 
-        CameraLens* result = new CameraLens;
+        QCameraLens* result = new QCameraLens;
         result->setPerspectiveProjection(yfov, 1.0, near, far);
         return result;
     } else if (camTy == "orthographic") {
-- 
cgit v1.2.3