diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-12 15:23:26 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-04-23 11:14:34 +0000 |
commit | 6d508fa954a2d90e90dff5a2e509aecd13b18f8f (patch) | |
tree | 32c788c4c637d6c9660706fc652f6515da3b4559 /src/extras/geometries | |
parent | 0542f1614aa6d50c4c9809fb0ce5f1adb5666d67 (diff) |
QNode: make cleanup a private slot
QT3D_CLONEABLE now implements a default dtor that calls _q_ cleanup
QT3D_CLONEABLE_CUSTOM_DTOR is used for classes that really need to implement
their own dtor but they need to invoke _q_cleanup manually
Change-Id: I2937a3b9edeb5a763749f0044360d78ab4461a5e
Task-number: QTBUG-51464
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/extras/geometries')
24 files changed, 0 insertions, 102 deletions
diff --git a/src/extras/geometries/qconegeometry.cpp b/src/extras/geometries/qconegeometry.cpp index 4d1c4ce17..b35d7155c 100644 --- a/src/extras/geometries/qconegeometry.cpp +++ b/src/extras/geometries/qconegeometry.cpp @@ -415,11 +415,6 @@ QConeGeometry::QConeGeometry(QConeGeometryPrivate &dd, QNode *parent) d->init(); } -QConeGeometry::~QConeGeometry() -{ - QGeometry::cleanup(); -} - void QConeGeometry::updateVertices() { Q_D(QConeGeometry); diff --git a/src/extras/geometries/qconegeometry.h b/src/extras/geometries/qconegeometry.h index 4f1dc944a..c581da59a 100644 --- a/src/extras/geometries/qconegeometry.h +++ b/src/extras/geometries/qconegeometry.h @@ -70,7 +70,6 @@ class QT3DEXTRASSHARED_EXPORT QConeGeometry : public Qt3DRender::QGeometry public: explicit QConeGeometry(QNode *parent = nullptr); - ~QConeGeometry(); void updateVertices(); void updateIndices(); diff --git a/src/extras/geometries/qconemesh.cpp b/src/extras/geometries/qconemesh.cpp index 621e06046..6e9415895 100644 --- a/src/extras/geometries/qconemesh.cpp +++ b/src/extras/geometries/qconemesh.cpp @@ -68,11 +68,6 @@ QConeMesh::QConeMesh(QNode *parent) QGeometryRenderer::setGeometry(geometry); } -QConeMesh::~QConeMesh() -{ - QNode::cleanup(); -} - void QConeMesh::setHasTopEndcap(bool hasTopEndcap) { static_cast<QConeGeometry *>(geometry())->setHasTopEndcap(hasTopEndcap); diff --git a/src/extras/geometries/qconemesh.h b/src/extras/geometries/qconemesh.h index c32070e5c..0dc546ea7 100644 --- a/src/extras/geometries/qconemesh.h +++ b/src/extras/geometries/qconemesh.h @@ -59,7 +59,6 @@ class QT3DEXTRASSHARED_EXPORT QConeMesh : public Qt3DRender::QGeometryRenderer Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged) public: explicit QConeMesh(Qt3DCore::QNode *parent = nullptr); - ~QConeMesh(); int rings() const; int slices() const; diff --git a/src/extras/geometries/qcuboidgeometry.cpp b/src/extras/geometries/qcuboidgeometry.cpp index b62ae0022..cc45e0785 100644 --- a/src/extras/geometries/qcuboidgeometry.cpp +++ b/src/extras/geometries/qcuboidgeometry.cpp @@ -595,14 +595,6 @@ QCuboidGeometry::QCuboidGeometry(QCuboidGeometryPrivate &dd, QNode *parent) } /*! - * Destroys this geometry. - */ -QCuboidGeometry::~QCuboidGeometry() -{ - QGeometry::cleanup(); -} - -/*! * Updates indices based on mesh resolutions. */ void QCuboidGeometry::updateIndices() diff --git a/src/extras/geometries/qcuboidgeometry.h b/src/extras/geometries/qcuboidgeometry.h index 7fa5f58ff..3ce52e3bd 100644 --- a/src/extras/geometries/qcuboidgeometry.h +++ b/src/extras/geometries/qcuboidgeometry.h @@ -73,7 +73,6 @@ class QT3DEXTRASSHARED_EXPORT QCuboidGeometry : public Qt3DRender::QGeometry public: explicit QCuboidGeometry(QNode *parent = Q_NULLPTR); - ~QCuboidGeometry(); void updateIndices(); void updateVertices(); diff --git a/src/extras/geometries/qcuboidmesh.cpp b/src/extras/geometries/qcuboidmesh.cpp index 99cfa4733..ac5b164c6 100644 --- a/src/extras/geometries/qcuboidmesh.cpp +++ b/src/extras/geometries/qcuboidmesh.cpp @@ -112,14 +112,6 @@ QCuboidMesh::QCuboidMesh(QNode *parent) QGeometryRenderer::setGeometry(geometry); } -/*! - * Destroys this cube mesh. - */ -QCuboidMesh::~QCuboidMesh() -{ - QNode::cleanup(); -} - void QCuboidMesh::setXExtent(float xExtent) { static_cast<QCuboidGeometry *>(geometry())->setXExtent(xExtent); diff --git a/src/extras/geometries/qcuboidmesh.h b/src/extras/geometries/qcuboidmesh.h index 72f6a007d..e06d09306 100644 --- a/src/extras/geometries/qcuboidmesh.h +++ b/src/extras/geometries/qcuboidmesh.h @@ -61,7 +61,6 @@ class QT3DEXTRASSHARED_EXPORT QCuboidMesh : public Qt3DRender::QGeometryRenderer public: explicit QCuboidMesh(Qt3DCore::QNode *parent = Q_NULLPTR); - ~QCuboidMesh(); float xExtent() const; float yExtent() const; diff --git a/src/extras/geometries/qcylindergeometry.cpp b/src/extras/geometries/qcylindergeometry.cpp index f514d0dc9..c0511c0e6 100644 --- a/src/extras/geometries/qcylindergeometry.cpp +++ b/src/extras/geometries/qcylindergeometry.cpp @@ -417,14 +417,6 @@ QCylinderGeometry::QCylinderGeometry(QCylinderGeometryPrivate &dd, QNode *parent } /*! - * Destroys the geometry. - */ -QCylinderGeometry::~QCylinderGeometry() -{ - QGeometry::cleanup(); -} - -/*! * Updates the vertices based on rings and slices. */ void QCylinderGeometry::updateVertices() diff --git a/src/extras/geometries/qcylindergeometry.h b/src/extras/geometries/qcylindergeometry.h index 570b2b25d..4d524b4f8 100644 --- a/src/extras/geometries/qcylindergeometry.h +++ b/src/extras/geometries/qcylindergeometry.h @@ -68,7 +68,6 @@ class QT3DEXTRASSHARED_EXPORT QCylinderGeometry : public Qt3DRender::QGeometry public: explicit QCylinderGeometry(QNode *parent = Q_NULLPTR); - ~QCylinderGeometry(); void updateVertices(); void updateIndices(); diff --git a/src/extras/geometries/qcylindermesh.cpp b/src/extras/geometries/qcylindermesh.cpp index 9cbf729a6..5a4e2c6a0 100644 --- a/src/extras/geometries/qcylindermesh.cpp +++ b/src/extras/geometries/qcylindermesh.cpp @@ -111,14 +111,6 @@ QCylinderMesh::QCylinderMesh(QNode *parent) QGeometryRenderer::setGeometry(geometry); } -/*! - * Destroys this cylinder mesh. - */ -QCylinderMesh::~QCylinderMesh() -{ - QNode::cleanup(); -} - void QCylinderMesh::setRings(int rings) { static_cast<QCylinderGeometry *>(geometry())->setRings(rings); diff --git a/src/extras/geometries/qcylindermesh.h b/src/extras/geometries/qcylindermesh.h index 256508576..63a497607 100644 --- a/src/extras/geometries/qcylindermesh.h +++ b/src/extras/geometries/qcylindermesh.h @@ -57,7 +57,6 @@ class QT3DEXTRASSHARED_EXPORT QCylinderMesh : public Qt3DRender::QGeometryRender Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged) public: explicit QCylinderMesh(Qt3DCore::QNode *parent = Q_NULLPTR); - ~QCylinderMesh(); int rings() const; int slices() const; diff --git a/src/extras/geometries/qplanegeometry.cpp b/src/extras/geometries/qplanegeometry.cpp index a0c0ffbc0..49beee4be 100644 --- a/src/extras/geometries/qplanegeometry.cpp +++ b/src/extras/geometries/qplanegeometry.cpp @@ -288,14 +288,6 @@ QPlaneGeometry::QPlaneGeometry(QPlaneGeometryPrivate &dd, QNode *parent) } /*! - * Destroys this geometry. - */ -QPlaneGeometry::~QPlaneGeometry() -{ - QGeometry::cleanup(); -} - -/*! * Updates vertices based on resolution. */ void QPlaneGeometry::updateVertices() diff --git a/src/extras/geometries/qplanegeometry.h b/src/extras/geometries/qplanegeometry.h index 708ea931d..a9031f780 100644 --- a/src/extras/geometries/qplanegeometry.h +++ b/src/extras/geometries/qplanegeometry.h @@ -70,7 +70,6 @@ class QT3DEXTRASSHARED_EXPORT QPlaneGeometry : public Qt3DRender::QGeometry public: explicit QPlaneGeometry(QNode *parent = Q_NULLPTR); - ~QPlaneGeometry(); void updateVertices(); void updateIndices(); diff --git a/src/extras/geometries/qplanemesh.cpp b/src/extras/geometries/qplanemesh.cpp index 4c6cc914d..34bdbc5ee 100644 --- a/src/extras/geometries/qplanemesh.cpp +++ b/src/extras/geometries/qplanemesh.cpp @@ -91,14 +91,6 @@ QPlaneMesh::QPlaneMesh(QNode *parent) QGeometryRenderer::setGeometry(geometry); } -/*! - * Destroys this plane mesh. - */ -QPlaneMesh::~QPlaneMesh() -{ - QNode::cleanup(); -} - void QPlaneMesh::setWidth(float width) { static_cast<QPlaneGeometry *>(geometry())->setWidth(width); diff --git a/src/extras/geometries/qplanemesh.h b/src/extras/geometries/qplanemesh.h index 45edbdf45..4f05a3896 100644 --- a/src/extras/geometries/qplanemesh.h +++ b/src/extras/geometries/qplanemesh.h @@ -57,7 +57,6 @@ class QT3DEXTRASSHARED_EXPORT QPlaneMesh : public Qt3DRender::QGeometryRenderer public: explicit QPlaneMesh(Qt3DCore::QNode *parent = Q_NULLPTR); - ~QPlaneMesh(); float width() const; float height() const; diff --git a/src/extras/geometries/qspheregeometry.cpp b/src/extras/geometries/qspheregeometry.cpp index 0e610346c..60fd5fd75 100644 --- a/src/extras/geometries/qspheregeometry.cpp +++ b/src/extras/geometries/qspheregeometry.cpp @@ -401,14 +401,6 @@ QSphereGeometry::QSphereGeometry(QSphereGeometryPrivate &dd, QNode *parent) } /*! - * Destroys this geometry. - */ -QSphereGeometry::~QSphereGeometry() -{ - QGeometry::cleanup(); -} - -/*! * Updates vertices based on rings and slices. */ void QSphereGeometry::updateVertices() diff --git a/src/extras/geometries/qspheregeometry.h b/src/extras/geometries/qspheregeometry.h index acc908d35..9f2d661e4 100644 --- a/src/extras/geometries/qspheregeometry.h +++ b/src/extras/geometries/qspheregeometry.h @@ -70,7 +70,6 @@ class QT3DEXTRASSHARED_EXPORT QSphereGeometry : public Qt3DRender::QGeometry public: explicit QSphereGeometry(QNode *parent = Q_NULLPTR); - ~QSphereGeometry(); void updateVertices(); void updateIndices(); diff --git a/src/extras/geometries/qspheremesh.cpp b/src/extras/geometries/qspheremesh.cpp index d5c4a1317..a17145181 100644 --- a/src/extras/geometries/qspheremesh.cpp +++ b/src/extras/geometries/qspheremesh.cpp @@ -99,14 +99,6 @@ QSphereMesh::QSphereMesh(QNode *parent) QGeometryRenderer::setGeometry(geometry); } -/*! - * Destroys this sphere mesh. - */ -QSphereMesh::~QSphereMesh() -{ - QNode::cleanup(); -} - void QSphereMesh::setRings(int rings) { static_cast<QSphereGeometry *>(geometry())->setRings(rings); diff --git a/src/extras/geometries/qspheremesh.h b/src/extras/geometries/qspheremesh.h index 7fe346e41..ac13cb563 100644 --- a/src/extras/geometries/qspheremesh.h +++ b/src/extras/geometries/qspheremesh.h @@ -59,7 +59,6 @@ class QT3DEXTRASSHARED_EXPORT QSphereMesh : public Qt3DRender::QGeometryRenderer public: explicit QSphereMesh(Qt3DCore::QNode *parent = Q_NULLPTR); - ~QSphereMesh(); int rings() const; int slices() const; diff --git a/src/extras/geometries/qtorusgeometry.cpp b/src/extras/geometries/qtorusgeometry.cpp index fe9ac7821..6e5ad8ac8 100644 --- a/src/extras/geometries/qtorusgeometry.cpp +++ b/src/extras/geometries/qtorusgeometry.cpp @@ -344,14 +344,6 @@ QTorusGeometry::QTorusGeometry(QTorusGeometryPrivate &dd, QNode *parent) } /*! - * Destroys this geometry. - */ -QTorusGeometry::~QTorusGeometry() -{ - QGeometry::cleanup(); -} - -/*! * Updates vertices based on rings and slices. */ void QTorusGeometry::updateVertices() diff --git a/src/extras/geometries/qtorusgeometry.h b/src/extras/geometries/qtorusgeometry.h index 99b76acd3..46637156d 100644 --- a/src/extras/geometries/qtorusgeometry.h +++ b/src/extras/geometries/qtorusgeometry.h @@ -69,7 +69,6 @@ class QT3DEXTRASSHARED_EXPORT QTorusGeometry : public Qt3DRender::QGeometry public: explicit QTorusGeometry(QNode *parent = Q_NULLPTR); - ~QTorusGeometry(); void updateVertices(); void updateIndices(); diff --git a/src/extras/geometries/qtorusmesh.cpp b/src/extras/geometries/qtorusmesh.cpp index 0f2143835..67f4cffa7 100644 --- a/src/extras/geometries/qtorusmesh.cpp +++ b/src/extras/geometries/qtorusmesh.cpp @@ -104,14 +104,6 @@ QTorusMesh::QTorusMesh(QNode *parent) QGeometryRenderer::setGeometry(geometry); } -/*! - * Destroys this torus mesh. - */ -QTorusMesh::~QTorusMesh() -{ - QGeometryRenderer::cleanup(); -} - void QTorusMesh::setRings(int rings) { static_cast<QTorusGeometry *>(geometry())->setRings(rings); diff --git a/src/extras/geometries/qtorusmesh.h b/src/extras/geometries/qtorusmesh.h index 16d1be736..064a589ce 100644 --- a/src/extras/geometries/qtorusmesh.h +++ b/src/extras/geometries/qtorusmesh.h @@ -56,7 +56,6 @@ class QT3DEXTRASSHARED_EXPORT QTorusMesh : public Qt3DRender::QGeometryRenderer Q_PROPERTY(float minorRadius READ minorRadius WRITE setMinorRadius NOTIFY minorRadiusChanged) public: explicit QTorusMesh(Qt3DCore::QNode *parent = Q_NULLPTR); - ~QTorusMesh(); int rings() const; int slices() const; |