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/plugins | |
| 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/plugins')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpparser.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp index 9e5a067a5..169147afe 100644 --- a/src/plugins/sceneparsers/assimp/assimpparser.cpp +++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp @@ -191,7 +191,7 @@ public : private: QMeshDataPtr m_meshData; - AssimpMesh *doClone() const Q_DECL_OVERRIDE; + QT3D_CLONEABLE(AssimpMesh) class AssimpMeshFunctor : public QAbstractMeshFunctor { @@ -831,13 +831,6 @@ void AssimpMesh::setData(QMeshDataPtr data) QAbstractMesh::setDirty(this); } -AssimpMesh *AssimpMesh::doClone() const -{ - AssimpMesh *clone = new AssimpMesh(); - clone->copy(this); - return clone; -} - QAbstractMeshFunctorPtr AssimpMesh::meshFunctor() const { return QAbstractMeshFunctorPtr(new AssimpMeshFunctor(m_meshData)); |