diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-09-29 17:19:36 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-10-03 21:18:41 +0200 |
| commit | 7b26f6a1746419161a8f875e341b3e31220f4141 (patch) | |
| tree | f784e568015e1f7f199abb388b97fefdb158c84e /src/quick3d/quick3drenderer | |
| parent | c16689bb1ccf31416df7b8c69fe032898cf87dec (diff) | |
QNode refactoring
Move almost everything to private classes.
Assimp loading restored.
All examples working.
QNode hierachy is now handled through QObject::setParent, addChild,
removeChild are part of the private api.
Note: commented QChangeArbiter unit tests as they can no longer work with this
patch and will restore them when QChangeArbiter will have been made private.
Task-number: QTBUG-41470
Task-number: QTBUG-41523
Change-Id: I4430974b3aa7f3744c38714b451b122e0cb4d0c9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drenderer')
| -rw-r--r-- | src/quick3d/quick3drenderer/items/quick3dparameter.cpp | 7 | ||||
| -rw-r--r-- | src/quick3d/quick3drenderer/items/quick3dparameter.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter.cpp b/src/quick3d/quick3drenderer/items/quick3dparameter.cpp index 336d067f3..70583d25f 100644 --- a/src/quick3d/quick3drenderer/items/quick3dparameter.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dparameter.cpp @@ -94,12 +94,13 @@ Quick3DParameter::Quick3DParameter(Quick3DParameterPrivate &dd, QNode *parent) { } -Quick3DParameter *Quick3DParameter::doClone(bool isClone) const +Quick3DParameter *Quick3DParameter::doClone() const { - return new Quick3DParameter(); + Quick3DParameter *clone = new Quick3DParameter(); + clone->d_func()->copy(d_func()); + return clone; } - } // Quick } // Render diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter.h b/src/quick3d/quick3drenderer/items/quick3dparameter.h index 9fcb77f6a..403fcefbc 100644 --- a/src/quick3d/quick3drenderer/items/quick3dparameter.h +++ b/src/quick3d/quick3drenderer/items/quick3dparameter.h @@ -66,7 +66,7 @@ private: protected: Quick3DParameter(Quick3DParameterPrivate &dd, QNode *parent = 0); - Quick3DParameter *doClone(bool isClone = true) const Q_DECL_OVERRIDE; + Quick3DParameter *doClone() const Q_DECL_OVERRIDE; }; } // Quick |