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/quick3d/quick3drender/items | |
| parent | ae5ac1128bc61176f797f6e248d18b9ced051ad9 (diff) | |
Strip out cloning subsystem
Change-Id: I4def54a11de0f9c676ef6b2d7bd8e723ded25ab9
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drender/items')
4 files changed, 8 insertions, 15 deletions
diff --git a/src/quick3d/quick3drender/items/quick3dparameter_p.h b/src/quick3d/quick3drender/items/quick3dparameter_p.h index 051e7b253..60493973d 100644 --- a/src/quick3d/quick3drender/items/quick3dparameter_p.h +++ b/src/quick3d/quick3drender/items/quick3dparameter_p.h @@ -73,7 +73,6 @@ private: protected: Quick3DParameter(Quick3DParameterPrivate &dd, QNode *parent = 0); - QT3D_CLONEABLE(Quick3DParameter) }; } // namespace Quick diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata_p.h b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h index ac55e0b5d..72c117c90 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdata_p.h +++ b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h @@ -68,9 +68,6 @@ class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderData : public QShaderDat Q_OBJECT public: explicit Quick3DShaderData(QNode *parent = 0); - -private: - QT3D_CLONEABLE(Quick3DShaderData) }; } // namespace Quick diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp index f9522f87d..21dd2525a 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp +++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp @@ -76,13 +76,14 @@ QVector<QShaderData *> Quick3DShaderDataArray::values() const return d->m_values; } -void Quick3DShaderDataArray::copy(const QNode *ref) -{ - QNode::copy(ref); - const Quick3DShaderDataArray *dataArray = static_cast<const Quick3DShaderDataArray *>(ref); - Q_FOREACH (QShaderData *v, dataArray->d_func()->m_values) - d_func()->m_values.append(static_cast<QShaderData *>(QNode::clone(v))); -} +// TODO: Avoid cloning here +//void Quick3DShaderDataArray::copy(const QNode *ref) +//{ +// QNode::copy(ref); +// const Quick3DShaderDataArray *dataArray = static_cast<const Quick3DShaderDataArray *>(ref); +// Q_FOREACH (QShaderData *v, dataArray->d_func()->m_values) +// d_func()->m_values.append(static_cast<QShaderData *>(QNode::clone(v))); +//} void Quick3DShaderDataArray::appendValue(QQmlListProperty<QShaderData> *list, QShaderData *bar) { diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h index 7f68e1456..effd18b32 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h +++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h @@ -79,16 +79,12 @@ public: QQmlListProperty<QShaderData> valuesList(); QVector<QShaderData *> values() const; -protected: - void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; - private: static void appendValue(QQmlListProperty<QShaderData> *list, QShaderData *bar); static QShaderData *valueAt(QQmlListProperty<QShaderData> *list, int index); static int valueCount(QQmlListProperty<QShaderData> *list); static void clearValues(QQmlListProperty<QShaderData> *list); Q_DECLARE_PRIVATE(Quick3DShaderDataArray) - QT3D_CLONEABLE(Quick3DShaderDataArray) }; } // namespace Quick |