diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2014-10-15 11:20:02 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-10-15 19:37:49 +0200 |
| commit | 0f1d0ff5b3adb16afcda091e4ff4657f53581f79 (patch) | |
| tree | bc82ff1bd2f31fe5fa54590ab3f1500d716b07eb /src/render/io/gltfparser.cpp | |
| parent | a4b9ce44ae244104a941981405742ee42d53ebe0 (diff) | |
Hide doClone implementations behind a macro
This way we will avoid inconsistencies. It also means making some of the
copy() implementations more clever.
Change-Id: Ic79c9ec7c9c32f8951d5d9f5184592880bf8d5fd
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io/gltfparser.cpp')
| -rw-r--r-- | src/render/io/gltfparser.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index 345c1ba9e..0888041bd 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -228,7 +228,7 @@ public: QAbstractMeshFunctorPtr meshFunctor() const Q_DECL_OVERRIDE; private: - GLTFParserMesh *doClone() const Q_DECL_OVERRIDE; + QT3D_CLONEABLE(GLTFParserMesh) Q_DECLARE_PRIVATE(GLTFParserMesh) }; @@ -1033,13 +1033,6 @@ QAbstractMeshFunctorPtr GLTFParserMesh::meshFunctor() const return QAbstractMeshFunctorPtr(new GLTFParserMeshFunctor(d->m_meshData)); } -GLTFParserMesh *GLTFParserMesh::doClone() const -{ - GLTFParserMesh *clone = new GLTFParserMesh(); - clone->d_func()->copy(d_func()); - return clone; -} - GLTFParserMesh::GLTFParserMeshFunctor::GLTFParserMeshFunctor(QMeshDataPtr meshData) : QAbstractMeshFunctor() , m_meshData(meshData) |