diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-07-08 16:50:13 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-07-09 16:01:12 +0200 |
| commit | 3b7fee401190a4a1347d6cbbdd84d6f0a0f07234 (patch) | |
| tree | 008c836a50a1845bea0fb7b35d9080e516209683 /src | |
| parent | 949795cedc6bfce7841ab13b801619416c1f79e5 (diff) | |
QCamera fixed d-pointer
Change-Id: I9e159cfffc44a5ee43eb311afdfb9b3f464c68b3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/core-components/qcamera.cpp | 16 | ||||
| -rw-r--r-- | src/core/core-components/qcamera.h | 4 | ||||
| -rw-r--r-- | src/core/core-components/qcamera_p.h | 11 |
3 files changed, 18 insertions, 13 deletions
diff --git a/src/core/core-components/qcamera.cpp b/src/core/core-components/qcamera.cpp index aa154c248..38d879765 100644 --- a/src/core/core-components/qcamera.cpp +++ b/src/core/core-components/qcamera.cpp @@ -49,12 +49,24 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -QCamera::QCamera(QNode *parent) : QEntity(parent) - , d_ptr(new QCameraPrivate(this)) +QCameraPrivate::QCameraPrivate(QCamera *qq) + : QEntityPrivate(qq), + m_lens(Q_NULLPTR), + m_transform(Q_NULLPTR) +{ +} + +QCamera::QCamera(QNode *parent) : + QEntity(*new QCameraPrivate(this), parent) { qDebug() << Q_FUNC_INFO; } +QCamera::QCamera(QCameraPrivate &dd, QNode *parent) + : QEntity(dd, parent) +{ +} + QCameraLens *QCamera::lens() const { Q_D(const QCamera); diff --git a/src/core/core-components/qcamera.h b/src/core/core-components/qcamera.h index ad8a14dae..3ac07ad5a 100644 --- a/src/core/core-components/qcamera.h +++ b/src/core/core-components/qcamera.h @@ -107,9 +107,7 @@ Q_SIGNALS: protected: Q_DECLARE_PRIVATE(QCamera) - -private: - QCameraPrivate* d_ptr; + QCamera(QCameraPrivate &dd, QNode *parent = 0); }; } // namespace Qt3D diff --git a/src/core/core-components/qcamera_p.h b/src/core/core-components/qcamera_p.h index f34a6c053..a974429e2 100644 --- a/src/core/core-components/qcamera_p.h +++ b/src/core/core-components/qcamera_p.h @@ -48,23 +48,18 @@ #include <Qt3DCore/qcameralens.h> #include <Qt3DCore/qlookattransform.h> #include <Qt3DCore/qtransform.h> +#include <private/qentity_p.h> QT_BEGIN_NAMESPACE namespace Qt3D { -class QT3DCORESHARED_EXPORT QCameraPrivate +class QT3DCORESHARED_EXPORT QCameraPrivate : public QEntityPrivate { public: - QCameraPrivate(QCamera *qq) - : q_ptr(qq), - m_lens(Q_NULLPTR), - m_transform(Q_NULLPTR) - { - } + QCameraPrivate(QCamera *qq); Q_DECLARE_PUBLIC(QCamera) - QCamera *q_ptr; QCameraLens *m_lens; QTransform *m_transform; |