diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-19 17:16:52 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-04-29 16:22:24 +0000 |
commit | 948d0357850918596b56f38a6dc6e25cd186f5a0 (patch) | |
tree | 2a522442757660b6eadecd3a6decde1f34ab5740 /src/render/lights | |
parent | ae5ac1128bc61176f797f6e248d18b9ced051ad9 (diff) |
Strip out cloning subsystem
Change-Id: I4def54a11de0f9c676ef6b2d7bd8e723ded25ab9
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/lights')
-rw-r--r-- | src/render/lights/qabstractlight.cpp | 8 | ||||
-rw-r--r-- | src/render/lights/qabstractlight.h | 2 | ||||
-rw-r--r-- | src/render/lights/qdirectionallight.cpp | 5 | ||||
-rw-r--r-- | src/render/lights/qdirectionallight.h | 2 | ||||
-rw-r--r-- | src/render/lights/qpointlight.h | 1 | ||||
-rw-r--r-- | src/render/lights/qspotlight.cpp | 10 | ||||
-rw-r--r-- | src/render/lights/qspotlight.h | 2 |
7 files changed, 1 insertions, 29 deletions
diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp index 1b4f3c199..767ce9031 100644 --- a/src/render/lights/qabstractlight.cpp +++ b/src/render/lights/qabstractlight.cpp @@ -61,14 +61,6 @@ QAbstractLightPrivate::QAbstractLightPrivate(QAbstractLight::Type type) m_shaderData->setProperty("type", type); } -void QAbstractLight::copy(const QNode *ref) -{ - const QAbstractLight *light = static_cast<const QAbstractLight*>(ref); - d_func()->m_type = light->d_func()->m_type; - d_func()->m_shaderData = qobject_cast<QShaderData *>(QNode::clone(light->d_func()->m_shaderData)); - QComponent::copy(ref); -} - Qt3DCore::QNodeCreatedChangeBasePtr QAbstractLight::createNodeCreationChange() const { auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QAbstractLightData>::create(this); diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h index 0a8593066..29c4eece1 100644 --- a/src/render/lights/qabstractlight.h +++ b/src/render/lights/qabstractlight.h @@ -77,7 +77,7 @@ public Q_SLOTS: protected : QAbstractLight(QAbstractLightPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); - void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; + Q_SIGNALS: void colorChanged(const QColor &color); diff --git a/src/render/lights/qdirectionallight.cpp b/src/render/lights/qdirectionallight.cpp index d53d86aa7..98a98e801 100644 --- a/src/render/lights/qdirectionallight.cpp +++ b/src/render/lights/qdirectionallight.cpp @@ -70,11 +70,6 @@ QDirectionalLightPrivate::QDirectionalLightPrivate() m_shaderData->setProperty("direction", QVector3D(0.0f, -1.0f, 0.0f)); } -void QDirectionalLight::copy(const QNode *ref) -{ - QAbstractLight::copy(ref); -} - QDirectionalLight::QDirectionalLight(QNode *parent) : QAbstractLight(*new QDirectionalLightPrivate, parent) { diff --git a/src/render/lights/qdirectionallight.h b/src/render/lights/qdirectionallight.h index ec2e960db..79ad7c663 100644 --- a/src/render/lights/qdirectionallight.h +++ b/src/render/lights/qdirectionallight.h @@ -66,11 +66,9 @@ Q_SIGNALS: protected: QDirectionalLight(QDirectionalLightPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); - void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QDirectionalLight) - QT3D_CLONEABLE(QDirectionalLight) }; } // namespace Qt3DRender diff --git a/src/render/lights/qpointlight.h b/src/render/lights/qpointlight.h index 972a19b20..6f975f07b 100644 --- a/src/render/lights/qpointlight.h +++ b/src/render/lights/qpointlight.h @@ -75,7 +75,6 @@ Q_SIGNALS: protected: Q_DECLARE_PRIVATE(QPointLight) QPointLight(QPointLightPrivate &dd, Qt3DCore::QNode *parent); - QT3D_CLONEABLE(QPointLight) }; } // namespace Qt3DRender diff --git a/src/render/lights/qspotlight.cpp b/src/render/lights/qspotlight.cpp index 711fb790c..7a510b89d 100644 --- a/src/render/lights/qspotlight.cpp +++ b/src/render/lights/qspotlight.cpp @@ -91,16 +91,6 @@ QSpotLightPrivate::QSpotLightPrivate() \brief For OpenGL ... */ -/*! \fn void Qt3DRender::QSpotLight::copy(const Qt3DCore::QNode *ref) - Copies the \a ref instance into this one. - */ - -void QSpotLight::copy(const QNode *ref) -{ - QAbstractLight::copy(ref); -} - - /*! \fn Qt3DRender::QSpotLight::QSpotLight(Qt3DCore::QNode *parent) Constructs a new QSpotLight with the specified \a parent. diff --git a/src/render/lights/qspotlight.h b/src/render/lights/qspotlight.h index 3d7889156..d66aa2719 100644 --- a/src/render/lights/qspotlight.h +++ b/src/render/lights/qspotlight.h @@ -84,11 +84,9 @@ Q_SIGNALS: protected: QSpotLight(QSpotLightPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); - void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QSpotLight) - QT3D_CLONEABLE(QSpotLight) }; } // namespace Qt3DRender |