diff options
Diffstat (limited to 'src/render/frontend')
7 files changed, 15 insertions, 15 deletions
diff --git a/src/render/frontend/framegraph-components/qcameraselector.cpp b/src/render/frontend/framegraph-components/qcameraselector.cpp index 09b887405..1db35b0a3 100644 --- a/src/render/frontend/framegraph-components/qcameraselector.cpp +++ b/src/render/frontend/framegraph-components/qcameraselector.cpp @@ -41,7 +41,7 @@ #include "qcameraselector.h" #include "qcameraselector_p.h" -#include <Qt3DCore/entity.h> +#include <Qt3DCore/qentity.h> #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE @@ -62,7 +62,7 @@ QCameraSelector::QCameraSelector(Qt3D::QNode *parent) : QFrameGraphItem(*new QCameraSelectorPrivate(this), parent) {} -void QCameraSelector::setCamera(Entity *camera) +void QCameraSelector::setCamera(QEntity *camera) { Q_D(QCameraSelector); if (d->m_camera != camera) { @@ -75,7 +75,7 @@ void QCameraSelector::setCamera(Entity *camera) } } -Entity *QCameraSelector::camera() const +QEntity *QCameraSelector::camera() const { Q_D(const QCameraSelector); return d->m_camera; diff --git a/src/render/frontend/framegraph-components/qcameraselector.h b/src/render/frontend/framegraph-components/qcameraselector.h index 803f38904..f292590b2 100644 --- a/src/render/frontend/framegraph-components/qcameraselector.h +++ b/src/render/frontend/framegraph-components/qcameraselector.h @@ -55,13 +55,13 @@ class QCameraSelectorPrivate; class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphItem { Q_OBJECT - Q_PROPERTY(Qt3D::Entity *camera READ camera WRITE setCamera NOTIFY cameraChanged) + Q_PROPERTY(Qt3D::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) public: explicit QCameraSelector(QNode *parent = 0); - void setCamera(Entity *camera); - Entity *camera() const; + void setCamera(QEntity *camera); + QEntity *camera() const; Q_SIGNALS: void cameraChanged(); diff --git a/src/render/frontend/framegraph-components/qcameraselector_p.h b/src/render/frontend/framegraph-components/qcameraselector_p.h index 2016ab9f0..e79697a65 100644 --- a/src/render/frontend/framegraph-components/qcameraselector_p.h +++ b/src/render/frontend/framegraph-components/qcameraselector_p.h @@ -56,7 +56,7 @@ public: QCameraSelectorPrivate(QCameraSelector *qq); Q_DECLARE_PUBLIC(QCameraSelector) - Entity *m_camera; + QEntity *m_camera; }; diff --git a/src/render/frontend/framegraph-components/qframegraph.cpp b/src/render/frontend/framegraph-components/qframegraph.cpp index f509a64f1..30dff26ef 100644 --- a/src/render/frontend/framegraph-components/qframegraph.cpp +++ b/src/render/frontend/framegraph-components/qframegraph.cpp @@ -41,7 +41,7 @@ #include "qframegraph.h" #include "qframegraph_p.h" -#include <Qt3DCore/entity.h> +#include <Qt3DCore/qentity.h> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qabstractscene.cpp b/src/render/frontend/qabstractscene.cpp index 569a3cac2..c1818b241 100644 --- a/src/render/frontend/qabstractscene.cpp +++ b/src/render/frontend/qabstractscene.cpp @@ -53,7 +53,7 @@ namespace Qt3D { namespace Render { QAbstractScenePrivate::QAbstractScenePrivate(QAbstractScene *qq) - : EntityPrivate(qq) + : QEntityPrivate(qq) , m_sceneNode(Q_NULLPTR) , m_sceneChild(Q_NULLPTR) , m_currentParser(Q_NULLPTR) @@ -61,12 +61,12 @@ QAbstractScenePrivate::QAbstractScenePrivate(QAbstractScene *qq) } QAbstractScene::QAbstractScene(QAbstractScenePrivate &dd, QNode *parent) - : Entity(dd, parent) + : QEntity(dd, parent) { } QAbstractScene::QAbstractScene(QNode *parent) - : Entity(*new QAbstractScenePrivate(this), parent) + : QEntity(*new QAbstractScenePrivate(this), parent) { Q_D(QAbstractScene); d->m_sceneNode = this; diff --git a/src/render/frontend/qabstractscene.h b/src/render/frontend/qabstractscene.h index d024a1c14..f329541c9 100644 --- a/src/render/frontend/qabstractscene.h +++ b/src/render/frontend/qabstractscene.h @@ -42,7 +42,7 @@ #ifndef QT3D_QABSTRACTSCENE_H #define QT3D_QABSTRACTSCENE_H -#include <Qt3DCore/entity.h> +#include <Qt3DCore/qentity.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE @@ -56,7 +56,7 @@ namespace Render { class QAbstractScene; class QAbstractScenePrivate; -class QT3DRENDERERSHARED_EXPORT QAbstractScene : public Entity +class QT3DRENDERERSHARED_EXPORT QAbstractScene : public QEntity { Q_OBJECT Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/render/frontend/qabstractscene_p.h b/src/render/frontend/qabstractscene_p.h index fc35858e5..fff88988c 100644 --- a/src/render/frontend/qabstractscene_p.h +++ b/src/render/frontend/qabstractscene_p.h @@ -42,7 +42,7 @@ #ifndef QT3D_QABSTRACTSCENE_P_H #define QT3D_QABSTRACTSCENE_P_H -#include <private/entity_p.h> +#include <private/qentity_p.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE @@ -55,7 +55,7 @@ namespace Render { class QAbstractScene; -class QT3DRENDERERSHARED_EXPORT QAbstractScenePrivate : public EntityPrivate +class QT3DRENDERERSHARED_EXPORT QAbstractScenePrivate : public QEntityPrivate { public: QAbstractScenePrivate(QAbstractScene *qq); |