diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-05-14 08:52:45 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-19 07:03:19 +0000 |
commit | 6f6207fadc1a334d1aed98f840a0d074acf18d06 (patch) | |
tree | 083bf49b4d6bc999f099b3c1e2897cb23cb89887 | |
parent | 72f2c87d15c76cc861699aea536e01bc8d56c8f2 (diff) |
De-inline dtors of public polymorphic classes
By making the destructor (usually the first non-inline, non-pure,
virtual function, and therefore the trigger for most compilers to
emit the vtable and type_info structures for the class in that TU)
out-of-line, vtables and, more importantly, type_info structures for
the class are pinned to a single TU. This prevents false negative
dynamic_cast and catch evaluation.
It also allows to add code to them later, if necessary.
Change-Id: I0da301cd788162abba6cdbbb21910090a22adb9a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
205 files changed, 648 insertions, 5 deletions
diff --git a/src/core/changes/qpropertynodeaddedchange.cpp b/src/core/changes/qpropertynodeaddedchange.cpp index d408ba457..5f1a1f921 100644 --- a/src/core/changes/qpropertynodeaddedchange.cpp +++ b/src/core/changes/qpropertynodeaddedchange.cpp @@ -76,6 +76,11 @@ QPropertyNodeAddedChange::QPropertyNodeAddedChange(QNodeId subjectId, QNode *nod d->m_addedNodeIdTypePair = QNodeIdTypePair(node->id(), node->metaObject()); } +/*! \internal */ +QPropertyNodeAddedChange::~QPropertyNodeAddedChange() +{ +} + /*! * \return the id of the node added to the property. */ diff --git a/src/core/changes/qpropertynodeaddedchange.h b/src/core/changes/qpropertynodeaddedchange.h index f4b716d8c..a816f711c 100644 --- a/src/core/changes/qpropertynodeaddedchange.h +++ b/src/core/changes/qpropertynodeaddedchange.h @@ -54,6 +54,7 @@ class QT3DCORESHARED_EXPORT QPropertyNodeAddedChange : public QStaticPropertyVal { public: explicit QPropertyNodeAddedChange(QNodeId subjectId, QNode *node); + ~QPropertyNodeAddedChange(); QNodeId addedNodeId() const; const QMetaObject *metaObject() const; diff --git a/src/core/changes/qpropertynoderemovedchange.cpp b/src/core/changes/qpropertynoderemovedchange.cpp index 9f0997add..590553cb9 100644 --- a/src/core/changes/qpropertynoderemovedchange.cpp +++ b/src/core/changes/qpropertynoderemovedchange.cpp @@ -81,6 +81,11 @@ QPropertyNodeRemovedChange::QPropertyNodeRemovedChange(QNodeId subjectId) { } +/*! \internal */ +QPropertyNodeRemovedChange::~QPropertyNodeRemovedChange() +{ +} + /*! * \return the id of the node removed to the property. */ diff --git a/src/core/changes/qpropertynoderemovedchange.h b/src/core/changes/qpropertynoderemovedchange.h index a1786d954..021d753cf 100644 --- a/src/core/changes/qpropertynoderemovedchange.h +++ b/src/core/changes/qpropertynoderemovedchange.h @@ -55,6 +55,7 @@ class QT3DCORESHARED_EXPORT QPropertyNodeRemovedChange : public QStaticPropertyV public: explicit QPropertyNodeRemovedChange(QNodeId subjectId, QNode *node); explicit QPropertyNodeRemovedChange(QNodeId subjectId); + ~QPropertyNodeRemovedChange(); QNodeId removedNodeId() const; const QMetaObject *metaObject() const; diff --git a/src/core/nodes/qbackendnode.cpp b/src/core/nodes/qbackendnode.cpp index 909fc4f7e..8435bc961 100644 --- a/src/core/nodes/qbackendnode.cpp +++ b/src/core/nodes/qbackendnode.cpp @@ -48,6 +48,11 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { +/*! \internal */ +QBackendNodeMapper::~QBackendNodeMapper() +{ +} + QBackendNodePrivate::QBackendNodePrivate(QBackendNode::Mode mode) : q_ptr(nullptr) , m_mode(mode) diff --git a/src/core/nodes/qbackendnode.h b/src/core/nodes/qbackendnode.h index fb32a9bce..39114034d 100644 --- a/src/core/nodes/qbackendnode.h +++ b/src/core/nodes/qbackendnode.h @@ -60,7 +60,7 @@ class QBackendNodeTester; class QT3DCORESHARED_EXPORT QBackendNodeMapper { public: - virtual ~QBackendNodeMapper() {} + virtual ~QBackendNodeMapper(); virtual QBackendNode *create(const QNodeCreatedChangeBasePtr &change) const = 0; virtual QBackendNode *get(QNodeId id) const = 0; virtual void destroy(QNodeId id) const = 0; diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp index f770e2ff7..41d89cb82 100644 --- a/src/core/transforms/qtransform.cpp +++ b/src/core/transforms/qtransform.cpp @@ -181,6 +181,13 @@ QTransform::QTransform(QNode *parent) /*! * \internal */ +QTransform::~QTransform() +{ +} + +/*! + * \internal + */ QTransform::QTransform(QTransformPrivate &dd, QNode *parent) : QComponent(dd, parent) { diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h index a71c218b4..9dcab1108 100644 --- a/src/core/transforms/qtransform.h +++ b/src/core/transforms/qtransform.h @@ -65,6 +65,7 @@ class QT3DCORESHARED_EXPORT QTransform : public QComponent public: explicit QTransform(QNode *parent = nullptr); + ~QTransform(); float scale() const; QVector3D scale3D() const; diff --git a/src/extras/defaults/qgoochmaterial.cpp b/src/extras/defaults/qgoochmaterial.cpp index a6f533745..6b6ea131a 100644 --- a/src/extras/defaults/qgoochmaterial.cpp +++ b/src/extras/defaults/qgoochmaterial.cpp @@ -224,6 +224,11 @@ QGoochMaterial::QGoochMaterial(QNode *parent) d->init(); } +/*! \internal */ +QGoochMaterial::~QGoochMaterial() +{ +} + QGoochMaterial::QGoochMaterial(QGoochMaterialPrivate &dd, QNode *parent) : QMaterial(dd, parent) { diff --git a/src/extras/defaults/qgoochmaterial.h b/src/extras/defaults/qgoochmaterial.h index e3a863433..232257513 100644 --- a/src/extras/defaults/qgoochmaterial.h +++ b/src/extras/defaults/qgoochmaterial.h @@ -63,6 +63,8 @@ class QT3DEXTRASSHARED_EXPORT QGoochMaterial : public Qt3DRender::QMaterial public: explicit QGoochMaterial(Qt3DCore::QNode *parent = nullptr); + ~QGoochMaterial(); + QColor diffuse() const; QColor specular() const; QColor cool() const; diff --git a/src/extras/defaults/qskyboxentity.cpp b/src/extras/defaults/qskyboxentity.cpp index 30e42a7a6..2e755f385 100644 --- a/src/extras/defaults/qskyboxentity.cpp +++ b/src/extras/defaults/qskyboxentity.cpp @@ -218,6 +218,11 @@ QSkyboxEntity::QSkyboxEntity(QNode *parent) d_func()->init(); } +/*! \internal */ +QSkyboxEntity::~QSkyboxEntity() +{ +} + /*! * Sets the base name to \a baseName. */ diff --git a/src/extras/defaults/qskyboxentity.h b/src/extras/defaults/qskyboxentity.h index 4295c2332..8cb279e1a 100644 --- a/src/extras/defaults/qskyboxentity.h +++ b/src/extras/defaults/qskyboxentity.h @@ -54,6 +54,7 @@ class QT3DEXTRASSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity Q_OBJECT public: explicit QSkyboxEntity(Qt3DCore::QNode *parent = nullptr); + ~QSkyboxEntity(); void setBaseName(const QString &path); QString baseName() const; diff --git a/src/extras/geometries/qconegeometry.cpp b/src/extras/geometries/qconegeometry.cpp index 64cc569e8..7215c0797 100644 --- a/src/extras/geometries/qconegeometry.cpp +++ b/src/extras/geometries/qconegeometry.cpp @@ -415,6 +415,12 @@ QConeGeometry::QConeGeometry(QConeGeometryPrivate &dd, QNode *parent) d->init(); } + +/*! \internal */ +QConeGeometry::~QConeGeometry() +{ +} + void QConeGeometry::updateVertices() { Q_D(QConeGeometry); diff --git a/src/extras/geometries/qconegeometry.h b/src/extras/geometries/qconegeometry.h index c581da59a..4f1dc944a 100644 --- a/src/extras/geometries/qconegeometry.h +++ b/src/extras/geometries/qconegeometry.h @@ -70,6 +70,7 @@ 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 6e9415895..e2f43b16d 100644 --- a/src/extras/geometries/qconemesh.cpp +++ b/src/extras/geometries/qconemesh.cpp @@ -68,6 +68,11 @@ QConeMesh::QConeMesh(QNode *parent) QGeometryRenderer::setGeometry(geometry); } +/*! \internal */ +QConeMesh::~QConeMesh() +{ +} + 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 0dc546ea7..c32070e5c 100644 --- a/src/extras/geometries/qconemesh.h +++ b/src/extras/geometries/qconemesh.h @@ -59,6 +59,7 @@ 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 dc76edbf6..21944c529 100644 --- a/src/extras/geometries/qcuboidgeometry.cpp +++ b/src/extras/geometries/qcuboidgeometry.cpp @@ -595,6 +595,13 @@ QCuboidGeometry::QCuboidGeometry(QCuboidGeometryPrivate &dd, QNode *parent) } /*! + * \internal + */ +QCuboidGeometry::~QCuboidGeometry() +{ +} + +/*! * Updates indices based on mesh resolutions. */ void QCuboidGeometry::updateIndices() diff --git a/src/extras/geometries/qcuboidgeometry.h b/src/extras/geometries/qcuboidgeometry.h index 1bf7905ea..fad5dcf9f 100644 --- a/src/extras/geometries/qcuboidgeometry.h +++ b/src/extras/geometries/qcuboidgeometry.h @@ -73,6 +73,7 @@ class QT3DEXTRASSHARED_EXPORT QCuboidGeometry : public Qt3DRender::QGeometry public: explicit QCuboidGeometry(QNode *parent = nullptr); + ~QCuboidGeometry(); void updateIndices(); void updateVertices(); diff --git a/src/extras/geometries/qcuboidmesh.cpp b/src/extras/geometries/qcuboidmesh.cpp index ac5b164c6..004fca472 100644 --- a/src/extras/geometries/qcuboidmesh.cpp +++ b/src/extras/geometries/qcuboidmesh.cpp @@ -112,6 +112,11 @@ QCuboidMesh::QCuboidMesh(QNode *parent) QGeometryRenderer::setGeometry(geometry); } +/*! \internal */ +QCuboidMesh::~QCuboidMesh() +{ +} + 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 93d386d2c..f709703c5 100644 --- a/src/extras/geometries/qcuboidmesh.h +++ b/src/extras/geometries/qcuboidmesh.h @@ -61,6 +61,7 @@ class QT3DEXTRASSHARED_EXPORT QCuboidMesh : public Qt3DRender::QGeometryRenderer public: explicit QCuboidMesh(Qt3DCore::QNode *parent = nullptr); + ~QCuboidMesh(); float xExtent() const; float yExtent() const; diff --git a/src/extras/geometries/qcylindergeometry.cpp b/src/extras/geometries/qcylindergeometry.cpp index 3231507f7..2cbe1939c 100644 --- a/src/extras/geometries/qcylindergeometry.cpp +++ b/src/extras/geometries/qcylindergeometry.cpp @@ -418,6 +418,13 @@ QCylinderGeometry::QCylinderGeometry(QCylinderGeometryPrivate &dd, QNode *parent } /*! + * \internal + */ +QCylinderGeometry::~QCylinderGeometry() +{ +} + +/*! * 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 9be49c67c..add4a7d96 100644 --- a/src/extras/geometries/qcylindergeometry.h +++ b/src/extras/geometries/qcylindergeometry.h @@ -68,6 +68,7 @@ class QT3DEXTRASSHARED_EXPORT QCylinderGeometry : public Qt3DRender::QGeometry public: explicit QCylinderGeometry(QNode *parent = nullptr); + ~QCylinderGeometry(); void updateVertices(); void updateIndices(); diff --git a/src/extras/geometries/qcylindermesh.cpp b/src/extras/geometries/qcylindermesh.cpp index 5a4e2c6a0..ef405cb6e 100644 --- a/src/extras/geometries/qcylindermesh.cpp +++ b/src/extras/geometries/qcylindermesh.cpp @@ -111,6 +111,11 @@ QCylinderMesh::QCylinderMesh(QNode *parent) QGeometryRenderer::setGeometry(geometry); } +/*! \internal */ +QCylinderMesh::~QCylinderMesh() +{ +} + 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 0da4b9555..3083ed849 100644 --- a/src/extras/geometries/qcylindermesh.h +++ b/src/extras/geometries/qcylindermesh.h @@ -57,6 +57,7 @@ class QT3DEXTRASSHARED_EXPORT QCylinderMesh : public Qt3DRender::QGeometryRender Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged) public: explicit QCylinderMesh(Qt3DCore::QNode *parent = nullptr); + ~QCylinderMesh(); int rings() const; int slices() const; diff --git a/src/extras/geometries/qplanegeometry.cpp b/src/extras/geometries/qplanegeometry.cpp index 29ec8256e..59ed9ee21 100644 --- a/src/extras/geometries/qplanegeometry.cpp +++ b/src/extras/geometries/qplanegeometry.cpp @@ -288,6 +288,13 @@ QPlaneGeometry::QPlaneGeometry(QPlaneGeometryPrivate &dd, QNode *parent) } /*! + * \internal + */ +QPlaneGeometry::~QPlaneGeometry() +{ +} + +/*! * Updates vertices based on resolution. */ void QPlaneGeometry::updateVertices() diff --git a/src/extras/geometries/qplanegeometry.h b/src/extras/geometries/qplanegeometry.h index d082269c3..7ec5cba43 100644 --- a/src/extras/geometries/qplanegeometry.h +++ b/src/extras/geometries/qplanegeometry.h @@ -70,6 +70,7 @@ class QT3DEXTRASSHARED_EXPORT QPlaneGeometry : public Qt3DRender::QGeometry public: explicit QPlaneGeometry(QNode *parent = nullptr); + ~QPlaneGeometry(); void updateVertices(); void updateIndices(); diff --git a/src/extras/geometries/qplanemesh.cpp b/src/extras/geometries/qplanemesh.cpp index 34bdbc5ee..f9d1a105b 100644 --- a/src/extras/geometries/qplanemesh.cpp +++ b/src/extras/geometries/qplanemesh.cpp @@ -91,6 +91,11 @@ QPlaneMesh::QPlaneMesh(QNode *parent) QGeometryRenderer::setGeometry(geometry); } +/*! \internal */ +QPlaneMesh::~QPlaneMesh() +{ +} + 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 b308908e8..b1505db17 100644 --- a/src/extras/geometries/qplanemesh.h +++ b/src/extras/geometries/qplanemesh.h @@ -57,6 +57,7 @@ class QT3DEXTRASSHARED_EXPORT QPlaneMesh : public Qt3DRender::QGeometryRenderer public: explicit QPlaneMesh(Qt3DCore::QNode *parent = nullptr); + ~QPlaneMesh(); float width() const; float height() const; diff --git a/src/extras/geometries/qspheregeometry.cpp b/src/extras/geometries/qspheregeometry.cpp index 38af69fe5..0c582f441 100644 --- a/src/extras/geometries/qspheregeometry.cpp +++ b/src/extras/geometries/qspheregeometry.cpp @@ -401,6 +401,13 @@ QSphereGeometry::QSphereGeometry(QSphereGeometryPrivate &dd, QNode *parent) } /*! + * \internal + */ +QSphereGeometry::~QSphereGeometry() +{ +} + +/*! * 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 5deb8a171..d657c0c67 100644 --- a/src/extras/geometries/qspheregeometry.h +++ b/src/extras/geometries/qspheregeometry.h @@ -70,6 +70,7 @@ class QT3DEXTRASSHARED_EXPORT QSphereGeometry : public Qt3DRender::QGeometry public: explicit QSphereGeometry(QNode *parent = nullptr); + ~QSphereGeometry(); void updateVertices(); void updateIndices(); diff --git a/src/extras/geometries/qspheremesh.cpp b/src/extras/geometries/qspheremesh.cpp index a17145181..205f6437f 100644 --- a/src/extras/geometries/qspheremesh.cpp +++ b/src/extras/geometries/qspheremesh.cpp @@ -99,6 +99,11 @@ QSphereMesh::QSphereMesh(QNode *parent) QGeometryRenderer::setGeometry(geometry); } +/*! \internal */ +QSphereMesh::~QSphereMesh() +{ +} + 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 5880f7188..58e77dcab 100644 --- a/src/extras/geometries/qspheremesh.h +++ b/src/extras/geometries/qspheremesh.h @@ -59,6 +59,7 @@ class QT3DEXTRASSHARED_EXPORT QSphereMesh : public Qt3DRender::QGeometryRenderer public: explicit QSphereMesh(Qt3DCore::QNode *parent = nullptr); + ~QSphereMesh(); int rings() const; int slices() const; diff --git a/src/extras/geometries/qtorusgeometry.cpp b/src/extras/geometries/qtorusgeometry.cpp index f62700755..5ca8c3ce1 100644 --- a/src/extras/geometries/qtorusgeometry.cpp +++ b/src/extras/geometries/qtorusgeometry.cpp @@ -344,6 +344,13 @@ QTorusGeometry::QTorusGeometry(QTorusGeometryPrivate &dd, QNode *parent) } /*! + * \internal + */ +QTorusGeometry::~QTorusGeometry() +{ +} + +/*! * 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 89e205a3f..ebde32bd8 100644 --- a/src/extras/geometries/qtorusgeometry.h +++ b/src/extras/geometries/qtorusgeometry.h @@ -69,6 +69,7 @@ class QT3DEXTRASSHARED_EXPORT QTorusGeometry : public Qt3DRender::QGeometry public: explicit QTorusGeometry(QNode *parent = nullptr); + ~QTorusGeometry(); void updateVertices(); void updateIndices(); diff --git a/src/extras/geometries/qtorusmesh.cpp b/src/extras/geometries/qtorusmesh.cpp index 67f4cffa7..e3b5b61d0 100644 --- a/src/extras/geometries/qtorusmesh.cpp +++ b/src/extras/geometries/qtorusmesh.cpp @@ -104,6 +104,11 @@ QTorusMesh::QTorusMesh(QNode *parent) QGeometryRenderer::setGeometry(geometry); } +/*! \internal */ +QTorusMesh::~QTorusMesh() +{ +} + 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 f75ec913a..69ad00efe 100644 --- a/src/extras/geometries/qtorusmesh.h +++ b/src/extras/geometries/qtorusmesh.h @@ -56,6 +56,7 @@ class QT3DEXTRASSHARED_EXPORT QTorusMesh : public Qt3DRender::QGeometryRenderer Q_PROPERTY(float minorRadius READ minorRadius WRITE setMinorRadius NOTIFY minorRadiusChanged) public: explicit QTorusMesh(Qt3DCore::QNode *parent = nullptr); + ~QTorusMesh(); int rings() const; int slices() const; diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp index 82d721a73..98313773e 100644 --- a/src/input/frontend/qabstractphysicaldevice.cpp +++ b/src/input/frontend/qabstractphysicaldevice.cpp @@ -56,6 +56,11 @@ QAbstractPhysicalDevicePrivate::QAbstractPhysicalDevicePrivate() { } +/*! \internal */ +QAbstractPhysicalDevicePrivate::~QAbstractPhysicalDevicePrivate() +{ +} + /*! \class Qt3DInput::QAbstractPhysicalDevice \inmodule Qt3DInput @@ -84,6 +89,11 @@ QAbstractPhysicalDevice::QAbstractPhysicalDevice(Qt3DCore::QNode *parent) { } +/*! \internal */ +QAbstractPhysicalDevice::~QAbstractPhysicalDevice() +{ +} + QAbstractPhysicalDevice::QAbstractPhysicalDevice(QAbstractPhysicalDevicePrivate &dd, Qt3DCore::QNode *parent) : Qt3DCore::QNode(dd, parent) { diff --git a/src/input/frontend/qabstractphysicaldevice.h b/src/input/frontend/qabstractphysicaldevice.h index 3725ae1c4..8c0abae4e 100644 --- a/src/input/frontend/qabstractphysicaldevice.h +++ b/src/input/frontend/qabstractphysicaldevice.h @@ -58,6 +58,7 @@ class QT3DINPUTSHARED_EXPORT QAbstractPhysicalDevice : public Qt3DCore::QNode Q_OBJECT public: explicit QAbstractPhysicalDevice(Qt3DCore::QNode *parent = nullptr); + ~QAbstractPhysicalDevice(); virtual int axisCount() const; virtual int buttonCount() const; diff --git a/src/input/frontend/qabstractphysicaldevice_p.h b/src/input/frontend/qabstractphysicaldevice_p.h index 082522fa5..55e98723c 100644 --- a/src/input/frontend/qabstractphysicaldevice_p.h +++ b/src/input/frontend/qabstractphysicaldevice_p.h @@ -68,6 +68,7 @@ class QT3DINPUTSHARED_PRIVATE_EXPORT QAbstractPhysicalDevicePrivate : public Qt3 { public: QAbstractPhysicalDevicePrivate(); + ~QAbstractPhysicalDevicePrivate(); Q_DECLARE_PUBLIC(QAbstractPhysicalDevice) QVector<QAxisSetting *> m_axisSettings; diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp index 2d7d29887..11a8d3ab6 100644 --- a/src/input/frontend/qaction.cpp +++ b/src/input/frontend/qaction.cpp @@ -76,6 +76,11 @@ QAction::QAction(Qt3DCore::QNode *parent) { } +/*! \internal */ +QAction::~QAction() +{ +} + /*! \fn QAction::nameChanged() diff --git a/src/input/frontend/qaction.h b/src/input/frontend/qaction.h index 9dc3ab3f4..937f2ec99 100644 --- a/src/input/frontend/qaction.h +++ b/src/input/frontend/qaction.h @@ -56,6 +56,7 @@ class QT3DINPUTSHARED_EXPORT QAction : public Qt3DCore::QNode Q_PROPERTY(bool active READ isActive NOTIFY activeChanged) public: explicit QAction(Qt3DCore::QNode *parent = nullptr); + ~QAction(); bool isActive() const; diff --git a/src/input/frontend/qactioninput.cpp b/src/input/frontend/qactioninput.cpp index 1ecd872bc..466277028 100644 --- a/src/input/frontend/qactioninput.cpp +++ b/src/input/frontend/qactioninput.cpp @@ -89,6 +89,11 @@ QActionInput::QActionInput(Qt3DCore::QNode *parent) } +/*! \internal */ +QActionInput::~QActionInput() +{ +} + /*! Return the Buttons to trigger the QActionInput instance. */ diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h index 2db2b9d95..9b06047b2 100644 --- a/src/input/frontend/qactioninput.h +++ b/src/input/frontend/qactioninput.h @@ -59,6 +59,7 @@ class QT3DINPUTSHARED_EXPORT QActionInput : public Qt3DInput::QAbstractActionInp public: explicit QActionInput(Qt3DCore::QNode *parent = nullptr); + ~QActionInput(); QAbstractPhysicalDevice *sourceDevice() const; QVector<int> buttons() const; diff --git a/src/input/frontend/qanalogaxisinput.cpp b/src/input/frontend/qanalogaxisinput.cpp index e688b0cec..92f3f5beb 100644 --- a/src/input/frontend/qanalogaxisinput.cpp +++ b/src/input/frontend/qanalogaxisinput.cpp @@ -66,6 +66,11 @@ QAnalogAxisInput::QAnalogAxisInput(Qt3DCore::QNode *parent) { } +/*! \internal */ +QAnalogAxisInput::~QAnalogAxisInput() +{ +} + void QAnalogAxisInput::setAxis(int axis) { Q_D(QAnalogAxisInput); diff --git a/src/input/frontend/qanalogaxisinput.h b/src/input/frontend/qanalogaxisinput.h index 8357332ea..f5523d0dd 100644 --- a/src/input/frontend/qanalogaxisinput.h +++ b/src/input/frontend/qanalogaxisinput.h @@ -56,6 +56,7 @@ class QT3DINPUTSHARED_EXPORT QAnalogAxisInput : public QAbstractAxisInput public: explicit QAnalogAxisInput(Qt3DCore::QNode *parent = nullptr); + ~QAnalogAxisInput(); int axis() const; diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp index 1cee05203..a12b277e9 100644 --- a/src/input/frontend/qaxis.cpp +++ b/src/input/frontend/qaxis.cpp @@ -69,6 +69,11 @@ QAxis::QAxis(Qt3DCore::QNode *parent) { } +/*! \internal */ +QAxis::~QAxis() +{ +} + void QAxis::addInput(QAbstractAxisInput *input) { Q_D(QAxis); diff --git a/src/input/frontend/qaxis.h b/src/input/frontend/qaxis.h index 9d89c01b8..92abd9c0d 100644 --- a/src/input/frontend/qaxis.h +++ b/src/input/frontend/qaxis.h @@ -55,6 +55,7 @@ class QT3DINPUTSHARED_EXPORT QAxis : public Qt3DCore::QNode Q_PROPERTY(float value READ value NOTIFY valueChanged) public: explicit QAxis(Qt3DCore::QNode *parent = nullptr); + ~QAxis(); void addInput(QAbstractAxisInput *input); void removeInput(QAbstractAxisInput *input); diff --git a/src/input/frontend/qaxissetting.cpp b/src/input/frontend/qaxissetting.cpp index 7614f9e8d..bd21097ef 100644 --- a/src/input/frontend/qaxissetting.cpp +++ b/src/input/frontend/qaxissetting.cpp @@ -67,6 +67,11 @@ QAxisSetting::QAxisSetting(Qt3DCore::QNode *parent) { } +/*! \internal */ +QAxisSetting::~QAxisSetting() +{ +} + QVariantList QAxisSetting::axes() const { Q_D(const QAxisSetting); diff --git a/src/input/frontend/qaxissetting.h b/src/input/frontend/qaxissetting.h index aace04a1b..6298dcb40 100644 --- a/src/input/frontend/qaxissetting.h +++ b/src/input/frontend/qaxissetting.h @@ -60,6 +60,7 @@ class QT3DINPUTSHARED_EXPORT QAxisSetting : public Qt3DCore::QNode public: explicit QAxisSetting(Qt3DCore::QNode *parent = nullptr); + ~QAxisSetting(); float deadZoneRadius() const; QVariantList axes() const; diff --git a/src/input/frontend/qbuttonaxisinput.cpp b/src/input/frontend/qbuttonaxisinput.cpp index f392605aa..1586cc0dc 100644 --- a/src/input/frontend/qbuttonaxisinput.cpp +++ b/src/input/frontend/qbuttonaxisinput.cpp @@ -66,6 +66,11 @@ QButtonAxisInput::QButtonAxisInput(Qt3DCore::QNode *parent) { } +/*! \internal */ +QButtonAxisInput::~QButtonAxisInput() +{ +} + void QButtonAxisInput::setScale(float scale) { Q_D(QButtonAxisInput); diff --git a/src/input/frontend/qbuttonaxisinput.h b/src/input/frontend/qbuttonaxisinput.h index cb2cb891e..3e9aacc00 100644 --- a/src/input/frontend/qbuttonaxisinput.h +++ b/src/input/frontend/qbuttonaxisinput.h @@ -59,6 +59,7 @@ class QT3DINPUTSHARED_EXPORT QButtonAxisInput : public QAbstractAxisInput public: explicit QButtonAxisInput(Qt3DCore::QNode *parent = nullptr); + ~QButtonAxisInput(); float scale() const; QVector<int> buttons() const; diff --git a/src/input/frontend/qinputchord.cpp b/src/input/frontend/qinputchord.cpp index b00bccd4b..b5953498e 100644 --- a/src/input/frontend/qinputchord.cpp +++ b/src/input/frontend/qinputchord.cpp @@ -99,6 +99,11 @@ QInputChord::QInputChord(Qt3DCore::QNode *parent) } +/*! \internal */ +QInputChord::~QInputChord() +{ +} + /*! \fn QInputChord::timeoutChanged() diff --git a/src/input/frontend/qinputchord.h b/src/input/frontend/qinputchord.h index 5177b84c2..f3e603eb5 100644 --- a/src/input/frontend/qinputchord.h +++ b/src/input/frontend/qinputchord.h @@ -58,6 +58,7 @@ class QT3DINPUTSHARED_EXPORT QInputChord : public Qt3DInput::QAbstractActionInpu public: explicit QInputChord(Qt3DCore::QNode *parent = nullptr); + ~QInputChord(); int timeout() const; diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp index 461605a64..2f89cd844 100644 --- a/src/input/frontend/qinputsequence.cpp +++ b/src/input/frontend/qinputsequence.cpp @@ -96,6 +96,11 @@ QInputSequence::QInputSequence(Qt3DCore::QNode *parent) } +/*! \internal */ +QInputSequence::~QInputSequence() +{ +} + /*! \fn QInputSequence::timeoutChanged() diff --git a/src/input/frontend/qinputsequence.h b/src/input/frontend/qinputsequence.h index b5a85c8a9..2baeb40b8 100644 --- a/src/input/frontend/qinputsequence.h +++ b/src/input/frontend/qinputsequence.h @@ -59,6 +59,7 @@ class QT3DINPUTSHARED_EXPORT QInputSequence : public Qt3DInput::QAbstractActionI public: explicit QInputSequence(Qt3DCore::QNode *parent = nullptr); + ~QInputSequence(); int timeout() const; int buttonInterval() const; diff --git a/src/input/frontend/qinputsettings.cpp b/src/input/frontend/qinputsettings.cpp index 73f5ec896..fde2feb55 100644 --- a/src/input/frontend/qinputsettings.cpp +++ b/src/input/frontend/qinputsettings.cpp @@ -56,6 +56,11 @@ QInputSettings::QInputSettings(Qt3DCore::QNode *parent) { } +/*! \internal */ +QInputSettings::~QInputSettings() +{ +} + QObject *QInputSettings::eventSource() const { Q_D(const QInputSettings); diff --git a/src/input/frontend/qinputsettings.h b/src/input/frontend/qinputsettings.h index b4ff0cf0f..8eb3b6bf2 100644 --- a/src/input/frontend/qinputsettings.h +++ b/src/input/frontend/qinputsettings.h @@ -55,6 +55,7 @@ class QT3DINPUTSHARED_EXPORT QInputSettings : public Qt3DCore::QComponent Q_PROPERTY(QObject *eventSource READ eventSource WRITE setEventSource NOTIFY eventSourceChanged) public: explicit QInputSettings(Qt3DCore::QNode *parent = nullptr); + ~QInputSettings(); QObject *eventSource() const; diff --git a/src/input/frontend/qkeyboarddevice.cpp b/src/input/frontend/qkeyboarddevice.cpp index cbfcd51f6..e2ade6efb 100644 --- a/src/input/frontend/qkeyboarddevice.cpp +++ b/src/input/frontend/qkeyboarddevice.cpp @@ -219,6 +219,11 @@ QKeyboardDevice::QKeyboardDevice(QNode *parent) { } +/*! \internal */ +QKeyboardDevice::~QKeyboardDevice() +{ +} + /*! \qmlproperty KeyboardHandler Qt3D.Input::KeyboardDevice::activeInput \readonly diff --git a/src/input/frontend/qkeyboarddevice.h b/src/input/frontend/qkeyboarddevice.h index 70ed438fd..a86687769 100644 --- a/src/input/frontend/qkeyboarddevice.h +++ b/src/input/frontend/qkeyboarddevice.h @@ -58,6 +58,7 @@ class QT3DINPUTSHARED_EXPORT QKeyboardDevice : public Qt3DInput::QAbstractPhysic public: explicit QKeyboardDevice(QNode *parent = nullptr); + ~QKeyboardDevice(); QKeyboardHandler *activeInput() const; diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp index 927eed48e..647fc8650 100644 --- a/src/input/frontend/qkeyboardhandler.cpp +++ b/src/input/frontend/qkeyboardhandler.cpp @@ -158,6 +158,11 @@ QKeyboardHandler::QKeyboardHandler(QNode *parent) { } +/*! \internal */ +QKeyboardHandler::~QKeyboardHandler() +{ +} + void QKeyboardHandler::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { Q_D(QKeyboardHandler); diff --git a/src/input/frontend/qkeyboardhandler.h b/src/input/frontend/qkeyboardhandler.h index 2a5196775..ba1959bfe 100644 --- a/src/input/frontend/qkeyboardhandler.h +++ b/src/input/frontend/qkeyboardhandler.h @@ -58,6 +58,7 @@ class QT3DINPUTSHARED_EXPORT QKeyboardHandler : public Qt3DCore::QComponent Q_PROPERTY(bool focus READ focus WRITE setFocus NOTIFY focusChanged) public: explicit QKeyboardHandler(QNode *parent = nullptr); + ~QKeyboardHandler(); Qt3DInput::QKeyboardDevice *sourceDevice() const; bool focus() const; diff --git a/src/input/frontend/qkeyevent.cpp b/src/input/frontend/qkeyevent.cpp index 50fa6d3e4..d3b346da0 100644 --- a/src/input/frontend/qkeyevent.cpp +++ b/src/input/frontend/qkeyevent.cpp @@ -75,6 +75,11 @@ QKeyEvent::QKeyEvent(const QT_PREPEND_NAMESPACE(QKeyEvent) &ke) m_event.setAccepted(false); } +/*! \internal */ +QKeyEvent::~QKeyEvent() +{ +} + /*! \qmlproperty int Qt3D.Input::KeyEvent::key \readonly diff --git a/src/input/frontend/qkeyevent.h b/src/input/frontend/qkeyevent.h index a75c0042b..0978a45e7 100644 --- a/src/input/frontend/qkeyevent.h +++ b/src/input/frontend/qkeyevent.h @@ -67,6 +67,7 @@ class QT3DINPUTSHARED_EXPORT QKeyEvent : public QObject public: explicit QKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers, const QString &text=QString(), bool autorep=false, ushort count=1); explicit QKeyEvent(const QT_PREPEND_NAMESPACE(QKeyEvent) &ke); + ~QKeyEvent(); inline int key() const { return m_event.key(); } inline QString text() const { return m_event.text(); } diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp index 07f233e48..3cb3a8b24 100644 --- a/src/input/frontend/qlogicaldevice.cpp +++ b/src/input/frontend/qlogicaldevice.cpp @@ -140,6 +140,10 @@ QLogicalDevice::QLogicalDevice(Qt3DCore::QNode *parent) { } +QLogicalDevice::~QLogicalDevice() +{ +} + /*! \qmlproperty QQmlListProperty<Action> Qt3D.Input::LogicalDevice::actions diff --git a/src/input/frontend/qlogicaldevice.h b/src/input/frontend/qlogicaldevice.h index 018d2cb5c..f60cfe2b1 100644 --- a/src/input/frontend/qlogicaldevice.h +++ b/src/input/frontend/qlogicaldevice.h @@ -56,6 +56,7 @@ class QT3DINPUTSHARED_EXPORT QLogicalDevice : public Qt3DCore::QComponent Q_OBJECT public: explicit QLogicalDevice(Qt3DCore::QNode *parent = nullptr); + ~QLogicalDevice(); void addAction(QAction *action); void removeAction(QAction *action); diff --git a/src/input/frontend/qmousedevice.cpp b/src/input/frontend/qmousedevice.cpp index 40e5df47c..ec0a24f46 100644 --- a/src/input/frontend/qmousedevice.cpp +++ b/src/input/frontend/qmousedevice.cpp @@ -76,6 +76,11 @@ QMouseDevice::QMouseDevice(QNode *parent) { } +/*! \internal */ +QMouseDevice::~QMouseDevice() +{ +} + int QMouseDevice::axisCount() const { // TO DO: we could have mouse wheel later on diff --git a/src/input/frontend/qmousedevice.h b/src/input/frontend/qmousedevice.h index 5ba1be595..fe43c6c84 100644 --- a/src/input/frontend/qmousedevice.h +++ b/src/input/frontend/qmousedevice.h @@ -59,6 +59,7 @@ class QT3DINPUTSHARED_EXPORT QMouseDevice : public Qt3DInput::QAbstractPhysicalD Q_PROPERTY(float sensitivity READ sensitivity WRITE setSensitivity NOTIFY sensitivityChanged) public: explicit QMouseDevice(Qt3DCore::QNode *parent = nullptr); + ~QMouseDevice(); enum Axis { X, diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp index 2d81b0b75..7f135d10c 100644 --- a/src/input/frontend/qmousehandler.cpp +++ b/src/input/frontend/qmousehandler.cpp @@ -118,6 +118,10 @@ QMouseHandler::QMouseHandler(QNode *parent) { } +QMouseHandler::~QMouseHandler() +{ +} + /*! * Sets the mouse device of the QMouseHandler instance to \a mouseDevice. */ diff --git a/src/input/frontend/qmousehandler.h b/src/input/frontend/qmousehandler.h index fbf62a127..750ed394d 100644 --- a/src/input/frontend/qmousehandler.h +++ b/src/input/frontend/qmousehandler.h @@ -59,6 +59,7 @@ class QT3DINPUTSHARED_EXPORT QMouseHandler : public Qt3DCore::QComponent public: explicit QMouseHandler(QNode *parent = nullptr); + ~QMouseHandler(); QMouseDevice *sourceDevice() const; bool containsMouse() const; diff --git a/src/input/frontend/qphysicaldevicecreatedchange.cpp b/src/input/frontend/qphysicaldevicecreatedchange.cpp index c9692b138..17edde76a 100644 --- a/src/input/frontend/qphysicaldevicecreatedchange.cpp +++ b/src/input/frontend/qphysicaldevicecreatedchange.cpp @@ -56,6 +56,11 @@ QPhysicalDeviceCreatedChangeBase::QPhysicalDeviceCreatedChangeBase(const QAbstra { } +/*! \internal */ +QPhysicalDeviceCreatedChangeBase::~QPhysicalDeviceCreatedChangeBase() +{ +} + Qt3DCore::QNodeIdVector QPhysicalDeviceCreatedChangeBase::axisSettingIds() const { Q_D(const QPhysicalDeviceCreatedChangeBase); diff --git a/src/input/frontend/qphysicaldevicecreatedchange.h b/src/input/frontend/qphysicaldevicecreatedchange.h index 42b5582e7..65cc4004a 100644 --- a/src/input/frontend/qphysicaldevicecreatedchange.h +++ b/src/input/frontend/qphysicaldevicecreatedchange.h @@ -51,6 +51,7 @@ class QT3DINPUTSHARED_EXPORT QPhysicalDeviceCreatedChangeBase : public Qt3DCore: { public: explicit QPhysicalDeviceCreatedChangeBase(const QAbstractPhysicalDevice *device); + ~QPhysicalDeviceCreatedChangeBase(); Qt3DCore::QNodeIdVector axisSettingIds() const; diff --git a/src/logic/qframeaction.cpp b/src/logic/qframeaction.cpp index 4ff540e21..d99f2d33e 100644 --- a/src/logic/qframeaction.cpp +++ b/src/logic/qframeaction.cpp @@ -84,6 +84,11 @@ QFrameAction::QFrameAction(QNode *parent) } /*! \internal */ +QFrameAction::~QFrameAction() +{ +} + +/*! \internal */ QFrameAction::QFrameAction(QFrameActionPrivate &dd, QNode *parent) : QComponent(dd, parent) { diff --git a/src/logic/qframeaction.h b/src/logic/qframeaction.h index 7c04d074a..f67bb9631 100644 --- a/src/logic/qframeaction.h +++ b/src/logic/qframeaction.h @@ -60,6 +60,7 @@ class QT3DLOGICSHARED_EXPORT QFrameAction : public Qt3DCore::QComponent public: explicit QFrameAction(Qt3DCore::QNode *parent = nullptr); + ~QFrameAction(); protected: QFrameAction(QFrameActionPrivate &dd, QNode *parent = nullptr); diff --git a/src/quick3d/quick3d/qqmlaspectengine.cpp b/src/quick3d/quick3d/qqmlaspectengine.cpp index 4e00b77b5..690f256a0 100644 --- a/src/quick3d/quick3d/qqmlaspectengine.cpp +++ b/src/quick3d/quick3d/qqmlaspectengine.cpp @@ -105,6 +105,11 @@ QQmlAspectEngine::QQmlAspectEngine(QObject *parent) { } +/*! \internal */ +QQmlAspectEngine::~QQmlAspectEngine() +{ +} + /*! * \return the status. */ diff --git a/src/quick3d/quick3d/qqmlaspectengine.h b/src/quick3d/quick3d/qqmlaspectengine.h index af1dd1142..c85cbb8ea 100644 --- a/src/quick3d/quick3d/qqmlaspectengine.h +++ b/src/quick3d/quick3d/qqmlaspectengine.h @@ -58,6 +58,7 @@ public: enum Status { Null, Ready, Loading, Error }; explicit QQmlAspectEngine(QObject *parent = nullptr); + ~QQmlAspectEngine(); Status status() const; void setSource(const QUrl &source); diff --git a/src/render/framegraph/qcameraselector.cpp b/src/render/framegraph/qcameraselector.cpp index cdebf48d9..7e26fb7a1 100644 --- a/src/render/framegraph/qcameraselector.cpp +++ b/src/render/framegraph/qcameraselector.cpp @@ -69,6 +69,11 @@ QCameraSelector::QCameraSelector(Qt3DCore::QNode *parent) { } +/*! \internal */ +QCameraSelector::~QCameraSelector() +{ +} + /*! \property Qt3DRender::QCameraSelector::camera */ diff --git a/src/render/framegraph/qcameraselector.h b/src/render/framegraph/qcameraselector.h index 3dfdb736b..5cdd04028 100644 --- a/src/render/framegraph/qcameraselector.h +++ b/src/render/framegraph/qcameraselector.h @@ -56,6 +56,7 @@ class QT3DRENDERSHARED_EXPORT QCameraSelector : public QFrameGraphNode public: explicit QCameraSelector(Qt3DCore::QNode *parent = nullptr); + ~QCameraSelector(); Qt3DCore::QEntity *camera() const; diff --git a/src/render/framegraph/qclearbuffers.cpp b/src/render/framegraph/qclearbuffers.cpp index 2079d9de9..48068e290 100644 --- a/src/render/framegraph/qclearbuffers.cpp +++ b/src/render/framegraph/qclearbuffers.cpp @@ -60,6 +60,11 @@ QClearBuffers::QClearBuffers(QNode *parent) } /*! \internal */ +QClearBuffers::~QClearBuffers() +{ +} + +/*! \internal */ QClearBuffers::QClearBuffers(QClearBuffersPrivate &dd, QNode *parent) : QFrameGraphNode(dd, parent) { diff --git a/src/render/framegraph/qclearbuffers.h b/src/render/framegraph/qclearbuffers.h index 4186f632a..d45af9ce0 100644 --- a/src/render/framegraph/qclearbuffers.h +++ b/src/render/framegraph/qclearbuffers.h @@ -62,6 +62,7 @@ class QT3DRENDERSHARED_EXPORT QClearBuffers : public QFrameGraphNode public: explicit QClearBuffers(Qt3DCore::QNode *parent = nullptr); + ~QClearBuffers(); enum BufferType { None = 0, diff --git a/src/render/framegraph/qdispatchcompute.cpp b/src/render/framegraph/qdispatchcompute.cpp index 5f83ffb53..0d3796c71 100644 --- a/src/render/framegraph/qdispatchcompute.cpp +++ b/src/render/framegraph/qdispatchcompute.cpp @@ -49,6 +49,11 @@ QDispatchCompute::QDispatchCompute(Qt3DCore::QNode *parent) { } +/*! \internal */ +QDispatchCompute::~QDispatchCompute() +{ +} + int QDispatchCompute::workGroupX() const { Q_D(const QDispatchCompute); diff --git a/src/render/framegraph/qdispatchcompute.h b/src/render/framegraph/qdispatchcompute.h index 1ec66cfe4..c5209b8c6 100644 --- a/src/render/framegraph/qdispatchcompute.h +++ b/src/render/framegraph/qdispatchcompute.h @@ -57,6 +57,7 @@ class QT3DRENDERSHARED_EXPORT QDispatchCompute : public QFrameGraphNode Q_PROPERTY(int workGroupZ READ workGroupZ WRITE setWorkGroupZ NOTIFY workGroupZChanged) public: explicit QDispatchCompute(Qt3DCore::QNode *parent = nullptr); + ~QDispatchCompute(); int workGroupX() const; int workGroupY() const; diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp index dd9c3d803..add8fc75d 100644 --- a/src/render/framegraph/qframegraphnode.cpp +++ b/src/render/framegraph/qframegraphnode.cpp @@ -78,6 +78,11 @@ QFrameGraphNode::QFrameGraphNode(QNode *parent) { } +/*! \internal */ +QFrameGraphNode::~QFrameGraphNode() +{ +} + /*! Returns a pointer to the parent. */ diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h index 67c719420..a7de9c1ad 100644 --- a/src/render/framegraph/qframegraphnode.h +++ b/src/render/framegraph/qframegraphnode.h @@ -55,6 +55,7 @@ class QT3DRENDERSHARED_EXPORT QFrameGraphNode : public Qt3DCore::QNode Q_OBJECT public: explicit QFrameGraphNode(Qt3DCore::QNode *parent = nullptr); + ~QFrameGraphNode(); QFrameGraphNode *parentFrameGraphNode() const; diff --git a/src/render/framegraph/qfrustumculling.cpp b/src/render/framegraph/qfrustumculling.cpp index 47ce74b97..ded5aa8a8 100644 --- a/src/render/framegraph/qfrustumculling.cpp +++ b/src/render/framegraph/qfrustumculling.cpp @@ -48,6 +48,11 @@ QFrustumCulling::QFrustumCulling(Qt3DCore::QNode *parent) { } +/*! \internal */ +QFrustumCulling::~QFrustumCulling() +{ +} + } // Qt3DRender QT_END_NAMESPACE diff --git a/src/render/framegraph/qfrustumculling.h b/src/render/framegraph/qfrustumculling.h index 0a09d6310..f0ed6d032 100644 --- a/src/render/framegraph/qfrustumculling.h +++ b/src/render/framegraph/qfrustumculling.h @@ -51,6 +51,7 @@ class QT3DRENDERSHARED_EXPORT QFrustumCulling : public QFrameGraphNode Q_OBJECT public: explicit QFrustumCulling(Qt3DCore::QNode *parent = nullptr); + ~QFrustumCulling(); }; } // Qt3DRender diff --git a/src/render/framegraph/qlayerfilter.cpp b/src/render/framegraph/qlayerfilter.cpp index 2fa07e8d8..c78142224 100644 --- a/src/render/framegraph/qlayerfilter.cpp +++ b/src/render/framegraph/qlayerfilter.cpp @@ -83,6 +83,11 @@ QLayerFilter::QLayerFilter(QLayerFilterPrivate &dd, QNode *parent) { } +/*! \internal */ +QLayerFilter::~QLayerFilter() +{ +} + /*! \property Qt3DRender::QLayerFilter::layers diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h index f49b8802f..61eac5773 100644 --- a/src/render/framegraph/qlayerfilter.h +++ b/src/render/framegraph/qlayerfilter.h @@ -55,6 +55,7 @@ class QT3DRENDERSHARED_EXPORT QLayerFilter : public QFrameGraphNode Q_OBJECT public: explicit QLayerFilter(Qt3DCore::QNode *parent = nullptr); + ~QLayerFilter(); void addLayer(QLayer *layer); void removeLayer(QLayer *layer); diff --git a/src/render/framegraph/qnodraw.cpp b/src/render/framegraph/qnodraw.cpp index 122c828f2..1f9d44717 100644 --- a/src/render/framegraph/qnodraw.cpp +++ b/src/render/framegraph/qnodraw.cpp @@ -64,6 +64,11 @@ QNoDraw::QNoDraw(QNode *parent) { } +/*! \internal */ +QNoDraw::~QNoDraw() +{ +} + } // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/framegraph/qnodraw.h b/src/render/framegraph/qnodraw.h index 17d490db6..4547aeeda 100644 --- a/src/render/framegraph/qnodraw.h +++ b/src/render/framegraph/qnodraw.h @@ -51,6 +51,7 @@ class QT3DRENDERSHARED_EXPORT QNoDraw : public QFrameGraphNode Q_OBJECT public: explicit QNoDraw(Qt3DCore::QNode *parent = nullptr); + ~QNoDraw(); }; } // namespace Qt3DRender diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp index 50b9e7de5..202a10a35 100644 --- a/src/render/framegraph/qrenderpassfilter.cpp +++ b/src/render/framegraph/qrenderpassfilter.cpp @@ -58,6 +58,11 @@ QRenderPassFilter::QRenderPassFilter(QNode *parent) {} /*! \internal */ +QRenderPassFilter::~QRenderPassFilter() +{ +} + +/*! \internal */ QRenderPassFilter::QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent) : QFrameGraphNode(dd, parent) { diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h index ba38a003e..934d0479b 100644 --- a/src/render/framegraph/qrenderpassfilter.h +++ b/src/render/framegraph/qrenderpassfilter.h @@ -59,6 +59,7 @@ class QT3DRENDERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode public: explicit QRenderPassFilter(Qt3DCore::QNode *parent = nullptr); + ~QRenderPassFilter(); QVector<QFilterKey*> matchAny() const; void addMatch(QFilterKey *filterKey); diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp index 93ad04940..5d0db339a 100644 --- a/src/render/framegraph/qrenderstateset.cpp +++ b/src/render/framegraph/qrenderstateset.cpp @@ -80,6 +80,11 @@ QRenderStateSet::QRenderStateSet(QNode *parent) { } +/*! \internal */ +QRenderStateSet::~QRenderStateSet() +{ +} + /*! * Adds a new QRenderState \a state to the QRenderStateSet instance. * diff --git a/src/render/framegraph/qrenderstateset.h b/src/render/framegraph/qrenderstateset.h index 6eeb9977e..52efaf24e 100644 --- a/src/render/framegraph/qrenderstateset.h +++ b/src/render/framegraph/qrenderstateset.h @@ -55,6 +55,7 @@ class QT3DRENDERSHARED_EXPORT QRenderStateSet : public QFrameGraphNode public: explicit QRenderStateSet(Qt3DCore::QNode *parent = nullptr); + ~QRenderStateSet(); void addRenderState(QRenderState *state); void removeRenderState(QRenderState *state); diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp index 6c2955176..9acd4d5e1 100644 --- a/src/render/framegraph/qrendersurfaceselector.cpp +++ b/src/render/framegraph/qrendersurfaceselector.cpp @@ -106,6 +106,13 @@ QRenderSurfaceSelector::QRenderSurfaceSelector(Qt3DCore::QNode *parent) /*! * \internal */ +QRenderSurfaceSelector::~QRenderSurfaceSelector() +{ +} + +/*! + * \internal + */ QRenderSurfaceSelector::QRenderSurfaceSelector(QRenderSurfaceSelectorPrivate &dd, Qt3DCore::QNode *parent) : Qt3DRender::QFrameGraphNode(dd, parent) { diff --git a/src/render/framegraph/qrendersurfaceselector.h b/src/render/framegraph/qrendersurfaceselector.h index 54d325fb0..57602a89d 100644 --- a/src/render/framegraph/qrendersurfaceselector.h +++ b/src/render/framegraph/qrendersurfaceselector.h @@ -61,6 +61,7 @@ class QT3DRENDERSHARED_EXPORT QRenderSurfaceSelector : public Qt3DRender::QFrame public: explicit QRenderSurfaceSelector(Qt3DCore::QNode *parent = nullptr); + ~QRenderSurfaceSelector(); QObject *surface() const; QSize externalRenderTargetSize() const; diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp index bc0b75ac4..f90e977a8 100644 --- a/src/render/framegraph/qrendertargetselector.cpp +++ b/src/render/framegraph/qrendertargetselector.cpp @@ -60,6 +60,11 @@ QRenderTargetSelector::QRenderTargetSelector(QNode *parent) { } +/*! \internal */ +QRenderTargetSelector::~QRenderTargetSelector() +{ +} + void QRenderTargetSelector::setTarget(QRenderTarget *target) { Q_D(QRenderTargetSelector); diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h index af8c8c1c4..a92fe1335 100644 --- a/src/render/framegraph/qrendertargetselector.h +++ b/src/render/framegraph/qrendertargetselector.h @@ -58,6 +58,7 @@ class QT3DRENDERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode Q_PROPERTY(Qt3DRender::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged) public: explicit QRenderTargetSelector(Qt3DCore::QNode *parent = nullptr); + ~QRenderTargetSelector(); QRenderTarget *target() const; diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp index 12f81fe77..ec4f58850 100644 --- a/src/render/framegraph/qsortpolicy.cpp +++ b/src/render/framegraph/qsortpolicy.cpp @@ -58,6 +58,11 @@ QSortPolicy::QSortPolicy(QNode *parent) } /*! \internal */ +QSortPolicy::~QSortPolicy() +{ +} + +/*! \internal */ QSortPolicy::QSortPolicy(QSortPolicyPrivate &dd, QNode *parent) : QFrameGraphNode(dd, parent) { diff --git a/src/render/framegraph/qsortpolicy.h b/src/render/framegraph/qsortpolicy.h index cbe7fe9c2..ba92b542c 100644 --- a/src/render/framegraph/qsortpolicy.h +++ b/src/render/framegraph/qsortpolicy.h @@ -54,6 +54,7 @@ class QT3DRENDERSHARED_EXPORT QSortPolicy : public QFrameGraphNode Q_PROPERTY(QVariantList sortTypes READ sortTypeList WRITE setSortTypes NOTIFY sortTypesChanged) public: explicit QSortPolicy(Qt3DCore::QNode *parent = nullptr); + ~QSortPolicy(); enum SortType { StateChangeCost = (1 << 0), diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index fb4f4c0b6..49ac03041 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -62,6 +62,11 @@ QTechniqueFilter::QTechniqueFilter(QNode *parent) } /*! \internal */ +QTechniqueFilter::~QTechniqueFilter() +{ +} + +/*! \internal */ QTechniqueFilter::QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent) : QFrameGraphNode(dd, parent) { diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h index bcee08db4..59b297c7d 100644 --- a/src/render/framegraph/qtechniquefilter.h +++ b/src/render/framegraph/qtechniquefilter.h @@ -56,6 +56,7 @@ class QT3DRENDERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode Q_OBJECT public: explicit QTechniqueFilter(Qt3DCore::QNode *parent = nullptr); + ~QTechniqueFilter(); QVector<QFilterKey*> matchAll() const; void addMatch(QFilterKey *filterKey); diff --git a/src/render/framegraph/qviewport.cpp b/src/render/framegraph/qviewport.cpp index 10b22748f..cdbe7efb5 100644 --- a/src/render/framegraph/qviewport.cpp +++ b/src/render/framegraph/qviewport.cpp @@ -58,6 +58,11 @@ QViewport::QViewport(QNode *parent) } /*! \internal */ +QViewport::~QViewport() +{ +} + +/*! \internal */ QViewport::QViewport(QViewportPrivate &dd, QNode *parent) : QFrameGraphNode(dd, parent) { diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h index 531586d66..5959ed791 100644 --- a/src/render/framegraph/qviewport.h +++ b/src/render/framegraph/qviewport.h @@ -57,6 +57,7 @@ class QT3DRENDERSHARED_EXPORT QViewport : public QFrameGraphNode public: explicit QViewport(Qt3DCore::QNode *parent = nullptr); + ~QViewport(); QRectF normalizedRect() const; diff --git a/src/render/frontend/qcamera.cpp b/src/render/frontend/qcamera.cpp index eac334240..f73960c77 100644 --- a/src/render/frontend/qcamera.cpp +++ b/src/render/frontend/qcamera.cpp @@ -87,6 +87,11 @@ QCamera::QCamera(Qt3DCore::QNode *parent) } /*! \internal */ +QCamera::~QCamera() +{ +} + +/*! \internal */ QCamera::QCamera(QCameraPrivate &dd, Qt3DCore::QNode *parent) : Qt3DCore::QEntity(dd, parent) { diff --git a/src/render/frontend/qcamera.h b/src/render/frontend/qcamera.h index 3b7bf95b9..73ab05cca 100644 --- a/src/render/frontend/qcamera.h +++ b/src/render/frontend/qcamera.h @@ -81,6 +81,7 @@ class QT3DRENDERSHARED_EXPORT QCamera : public Qt3DCore::QEntity public: explicit QCamera(QNode *parent = nullptr); + ~QCamera(); enum CameraTranslationOption { TranslateViewCenter, diff --git a/src/render/frontend/qcameralens.cpp b/src/render/frontend/qcameralens.cpp index c86610f3d..3f7a9f4f7 100644 --- a/src/render/frontend/qcameralens.cpp +++ b/src/render/frontend/qcameralens.cpp @@ -68,6 +68,11 @@ QCameraLens::QCameraLens(QNode *parent) d->updateProjectionMatrix(); } +/*! \internal */ +QCameraLens::~QCameraLens() +{ +} + /*! \class Qt3DRender::QCameraLens * \inmodule Qt3DCore * diff --git a/src/render/frontend/qcameralens.h b/src/render/frontend/qcameralens.h index f719aff3d..6739369dc 100644 --- a/src/render/frontend/qcameralens.h +++ b/src/render/frontend/qcameralens.h @@ -69,6 +69,7 @@ class QT3DRENDERSHARED_EXPORT QCameraLens : public Qt3DCore::QComponent public: explicit QCameraLens(QNode *parent = nullptr); + ~QCameraLens(); enum ProjectionType { OrthographicProjection, diff --git a/src/render/frontend/qcomputecommand.cpp b/src/render/frontend/qcomputecommand.cpp index 2e1ea7421..0c1403169 100644 --- a/src/render/frontend/qcomputecommand.cpp +++ b/src/render/frontend/qcomputecommand.cpp @@ -57,6 +57,11 @@ QComputeCommand::QComputeCommand(Qt3DCore::QNode *parent) { } +/*! \internal */ +QComputeCommand::~QComputeCommand() +{ +} + int QComputeCommand::workGroupX() const { Q_D(const QComputeCommand); diff --git a/src/render/frontend/qcomputecommand.h b/src/render/frontend/qcomputecommand.h index e497574d0..6bc31c6f6 100644 --- a/src/render/frontend/qcomputecommand.h +++ b/src/render/frontend/qcomputecommand.h @@ -57,8 +57,8 @@ class QT3DRENDERSHARED_EXPORT QComputeCommand : public Qt3DCore::QComponent Q_PROPERTY(int workGroupZ READ workGroupZ WRITE setWorkGroupZ NOTIFY workGroupZChanged) public: - explicit QComputeCommand(Qt3DCore::QNode *parent = nullptr); + ~QComputeCommand(); int workGroupX() const; int workGroupY() const; diff --git a/src/render/frontend/qlayer.cpp b/src/render/frontend/qlayer.cpp index 47a0ffa35..e9f23a015 100644 --- a/src/render/frontend/qlayer.cpp +++ b/src/render/frontend/qlayer.cpp @@ -75,6 +75,11 @@ QLayer::QLayer(QNode *parent) } /*! \internal */ +QLayer::~QLayer() +{ +} + +/*! \internal */ QLayer::QLayer(QLayerPrivate &dd, QNode *parent) : QComponent(dd, parent) { diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h index b45e5f8cf..f44685d7e 100644 --- a/src/render/frontend/qlayer.h +++ b/src/render/frontend/qlayer.h @@ -55,6 +55,7 @@ class QT3DRENDERSHARED_EXPORT QLayer : public Qt3DCore::QComponent Q_OBJECT public: explicit QLayer(Qt3DCore::QNode *parent = nullptr); + ~QLayer(); protected: explicit QLayer(QLayerPrivate &dd, Qt3DCore::QNode *parent = nullptr); diff --git a/src/render/frontend/qpickingsettings.cpp b/src/render/frontend/qpickingsettings.cpp index abb6115cb..a8bf38353 100644 --- a/src/render/frontend/qpickingsettings.cpp +++ b/src/render/frontend/qpickingsettings.cpp @@ -56,6 +56,11 @@ QPickingSettings::QPickingSettings(Qt3DCore::QNode *parent) { } +/*! \internal */ +QPickingSettings::~QPickingSettings() +{ +} + QPickingSettings::QPickingSettings(QPickingSettingsPrivate &dd, Qt3DCore::QNode *parent) : Qt3DCore::QNode(dd, parent) { diff --git a/src/render/frontend/qpickingsettings.h b/src/render/frontend/qpickingsettings.h index 8b765a4ad..a530a4b33 100644 --- a/src/render/frontend/qpickingsettings.h +++ b/src/render/frontend/qpickingsettings.h @@ -57,6 +57,7 @@ class QT3DRENDERSHARED_EXPORT QPickingSettings : public Qt3DCore::QNode public: explicit QPickingSettings(Qt3DCore::QNode *parent = nullptr); + ~QPickingSettings(); enum PickMethod { BoundingVolumePicking, diff --git a/src/render/frontend/qrendersettings.cpp b/src/render/frontend/qrendersettings.cpp index 9ae1d7b51..a6e4a99eb 100644 --- a/src/render/frontend/qrendersettings.cpp +++ b/src/render/frontend/qrendersettings.cpp @@ -81,6 +81,7 @@ QRenderSettings::QRenderSettings(QRenderSettingsPrivate &dd, Qt3DCore::QNode *pa d->init(); } +/*! \internal */ QRenderSettings::~QRenderSettings() { } diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp index 9a0b079d9..0157a16f0 100644 --- a/src/render/frontend/qrendertarget.cpp +++ b/src/render/frontend/qrendertarget.cpp @@ -61,6 +61,11 @@ QRenderTarget::QRenderTarget(QNode *parent) } /*! \internal */ +QRenderTarget::~QRenderTarget() +{ +} + +/*! \internal */ QRenderTarget::QRenderTarget(QRenderTargetPrivate &dd, QNode *parent) : QComponent(dd, parent) { diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h index a7bba422b..cb0edde51 100644 --- a/src/render/frontend/qrendertarget.h +++ b/src/render/frontend/qrendertarget.h @@ -55,6 +55,7 @@ class QT3DRENDERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent Q_OBJECT public: explicit QRenderTarget(Qt3DCore::QNode *parent = nullptr); + ~QRenderTarget(); void addOutput(QRenderTargetOutput *output); void removeOutput(QRenderTargetOutput *output); diff --git a/src/render/frontend/qrendertargetoutput.cpp b/src/render/frontend/qrendertargetoutput.cpp index bfa51957f..75bf1ab91 100644 --- a/src/render/frontend/qrendertargetoutput.cpp +++ b/src/render/frontend/qrendertargetoutput.cpp @@ -62,6 +62,11 @@ QRenderTargetOutput::QRenderTargetOutput(QNode *parent) } /*! \internal */ +QRenderTargetOutput::~QRenderTargetOutput() +{ +} + +/*! \internal */ QRenderTargetOutput::QRenderTargetOutput(QRenderTargetOutputPrivate &dd, QNode *parent) : QNode(dd, parent) { diff --git a/src/render/frontend/qrendertargetoutput.h b/src/render/frontend/qrendertargetoutput.h index 15a6f7321..1f78dd279 100644 --- a/src/render/frontend/qrendertargetoutput.h +++ b/src/render/frontend/qrendertargetoutput.h @@ -85,6 +85,7 @@ public: Q_ENUM(AttachmentPoint) explicit QRenderTargetOutput(Qt3DCore::QNode *parent = nullptr); + ~QRenderTargetOutput(); AttachmentPoint attachmentPoint() const; QAbstractTexture *texture() const; diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp index 14b8f0cf1..1e9348567 100644 --- a/src/render/geometry/qattribute.cpp +++ b/src/render/geometry/qattribute.cpp @@ -148,6 +148,11 @@ QAttribute::QAttribute(QBuffer *buf, const QString &name, VertexBaseType type, u d->m_byteStride = stride; } +/*! \internal */ +QAttribute::~QAttribute() +{ +} + /*! * \property QAttribute::buffer * diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h index 85a82317a..e6b525dc4 100644 --- a/src/render/geometry/qattribute.h +++ b/src/render/geometry/qattribute.h @@ -90,6 +90,7 @@ public: explicit QAttribute(QNode *parent = nullptr); explicit QAttribute(QBuffer *buf, VertexBaseType vertexBaseType, uint vertexSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = nullptr); explicit QAttribute(QBuffer *buf, const QString &name, VertexBaseType vertexBaseType, uint vertexSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = nullptr); + ~QAttribute(); QBuffer *buffer() const; QString name() const; diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp index a966c5ff3..2b265f520 100644 --- a/src/render/geometry/qbuffer.cpp +++ b/src/render/geometry/qbuffer.cpp @@ -156,6 +156,13 @@ QBuffer::QBuffer(QBuffer::BufferType ty, QNode *parent) /*! * \internal */ +QBuffer::~QBuffer() +{ +} + +/*! + * \internal + */ void QBuffer::sceneChangeEvent(const QSceneChangePtr &change) { QPropertyUpdatedChangePtr e = qSharedPointerCast<QPropertyUpdatedChange>(change); diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h index 19d869e9f..ba5877e6e 100644 --- a/src/render/geometry/qbuffer.h +++ b/src/render/geometry/qbuffer.h @@ -86,6 +86,7 @@ public: Q_ENUM(UsageType) explicit QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = nullptr); + ~QBuffer(); UsageType usage() const; BufferType type() const; diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp index c1add2866..9749faa71 100644 --- a/src/render/geometry/qgeometry.cpp +++ b/src/render/geometry/qgeometry.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qgeometry.h" +#include "qgeometryfactory.h" #include "qgeometry_p.h" #include <private/qnode_p.h> #include <Qt3DRender/qattribute.h> @@ -51,6 +52,10 @@ using namespace Qt3DCore; namespace Qt3DRender { +QGeometryFactory::~QGeometryFactory() +{ +} + /*! * \qmltype Geometry * \instantiates Qt3DRender::QGeometry @@ -89,6 +94,13 @@ QGeometry::QGeometry(QNode *parent) /*! * \internal */ +QGeometry::~QGeometry() +{ +} + +/*! + * \internal + */ QGeometry::QGeometry(QGeometryPrivate &dd, QNode *parent) : QNode(dd, parent) { diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h index dee254236..70fea8cd9 100644 --- a/src/render/geometry/qgeometry.h +++ b/src/render/geometry/qgeometry.h @@ -56,6 +56,7 @@ class QT3DRENDERSHARED_EXPORT QGeometry : public Qt3DCore::QNode Q_PROPERTY(Qt3DRender::QAttribute *boundingVolumePositionAttribute READ boundingVolumePositionAttribute WRITE setBoundingVolumePositionAttribute NOTIFY boundingVolumePositionAttributeChanged) public: explicit QGeometry(Qt3DCore::QNode *parent = nullptr); + ~QGeometry(); QVector<QAttribute *> attributes() const; void addAttribute(QAttribute *attribute); diff --git a/src/render/geometry/qgeometryfactory.h b/src/render/geometry/qgeometryfactory.h index b9f722844..affcc0e52 100644 --- a/src/render/geometry/qgeometryfactory.h +++ b/src/render/geometry/qgeometryfactory.h @@ -53,7 +53,7 @@ class QGeometry; class QT3DRENDERSHARED_EXPORT QGeometryFactory : public QAbstractFunctor { public: - virtual ~QGeometryFactory() {} + virtual ~QGeometryFactory(); virtual QGeometry *operator()() = 0; virtual bool operator ==(const QGeometryFactory &other) const = 0; }; diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index 2d9c5ee50..97cf4836c 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -170,6 +170,13 @@ QGeometryRenderer::QGeometryRenderer(QNode *parent) /*! * \internal */ +QGeometryRenderer::~QGeometryRenderer() +{ +} + +/*! + * \internal + */ QGeometryRenderer::QGeometryRenderer(QGeometryRendererPrivate &dd, QNode *parent) : QComponent(dd, parent) { diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index 60b769a0b..be3bb6146 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -69,6 +69,7 @@ class QT3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent public: explicit QGeometryRenderer(Qt3DCore::QNode *parent = nullptr); + ~QGeometryRenderer(); enum PrimitiveType { Points = 0x0000, diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp index 21ceb8ba6..0d4faf2f8 100644 --- a/src/render/geometry/qmesh.cpp +++ b/src/render/geometry/qmesh.cpp @@ -108,6 +108,11 @@ QMesh::QMesh(QNode *parent) } /*! \internal */ +QMesh::~QMesh() +{ +} + +/*! \internal */ QMesh::QMesh(QMeshPrivate &dd, QNode *parent) : QGeometryRenderer(dd, parent) { diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h index 75c4a14f6..fab76a249 100644 --- a/src/render/geometry/qmesh.h +++ b/src/render/geometry/qmesh.h @@ -62,6 +62,7 @@ class QT3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer public: explicit QMesh(Qt3DCore::QNode *parent = nullptr); + ~QMesh(); QUrl source() const; QString meshName() const; diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp index 8570aa3cd..5ae0a4343 100644 --- a/src/render/io/qsceneloader.cpp +++ b/src/render/io/qsceneloader.cpp @@ -65,6 +65,11 @@ QSceneLoader::QSceneLoader(QNode *parent) { } +/*! \internal */ +QSceneLoader::~QSceneLoader() +{ +} + QSceneLoader::QSceneLoader(QSceneLoaderPrivate &dd, QNode *parent) : Qt3DCore::QComponent(dd, parent) { diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h index 59bf63e03..2b39ebeb4 100644 --- a/src/render/io/qsceneloader.h +++ b/src/render/io/qsceneloader.h @@ -58,6 +58,7 @@ class QT3DRENDERSHARED_EXPORT QSceneLoader : public Qt3DCore::QComponent Q_PROPERTY(Status status READ status NOTIFY statusChanged) public: explicit QSceneLoader(Qt3DCore::QNode *parent = nullptr); + ~QSceneLoader(); void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; enum Status { diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp index 767ce9031..e3d0d86bf 100644 --- a/src/render/lights/qabstractlight.cpp +++ b/src/render/lights/qabstractlight.cpp @@ -83,6 +83,10 @@ QAbstractLight::QAbstractLight(QAbstractLightPrivate &dd, QNode *parent) d->m_shaderData->setParent(this); } +QAbstractLight::~QAbstractLight() +{ +} + QAbstractLight::Type QAbstractLight::type() const { Q_D(const QAbstractLight); diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h index 8ac9bc05f..7cc98b57b 100644 --- a/src/render/lights/qabstractlight.h +++ b/src/render/lights/qabstractlight.h @@ -59,7 +59,9 @@ class QT3DRENDERSHARED_EXPORT QAbstractLight : public Qt3DCore::QComponent Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(float intensity READ intensity WRITE setIntensity NOTIFY intensityChanged) -public : +public: + ~QAbstractLight(); + enum Type { PointLight = 0, DirectionalLight, diff --git a/src/render/lights/qdirectionallight.cpp b/src/render/lights/qdirectionallight.cpp index ca16ba878..57b5c85cd 100644 --- a/src/render/lights/qdirectionallight.cpp +++ b/src/render/lights/qdirectionallight.cpp @@ -76,6 +76,11 @@ QDirectionalLight::QDirectionalLight(QNode *parent) } /*! \internal */ +QDirectionalLight::~QDirectionalLight() +{ +} + +/*! \internal */ QDirectionalLight::QDirectionalLight(QDirectionalLightPrivate &dd, QNode *parent) : QAbstractLight(dd, parent) { diff --git a/src/render/lights/qdirectionallight.h b/src/render/lights/qdirectionallight.h index 46d5db927..6be1585db 100644 --- a/src/render/lights/qdirectionallight.h +++ b/src/render/lights/qdirectionallight.h @@ -55,6 +55,7 @@ class QT3DRENDERSHARED_EXPORT QDirectionalLight : public QAbstractLight public: explicit QDirectionalLight(Qt3DCore::QNode *parent = nullptr); + ~QDirectionalLight(); QVector3D worldDirection() const; diff --git a/src/render/lights/qpointlight.cpp b/src/render/lights/qpointlight.cpp index b62980d34..1936ef4f4 100644 --- a/src/render/lights/qpointlight.cpp +++ b/src/render/lights/qpointlight.cpp @@ -95,6 +95,11 @@ QPointLight::QPointLight(QNode *parent) } /*! \internal */ +QPointLight::~QPointLight() +{ +} + +/*! \internal */ QPointLight::QPointLight(QPointLightPrivate &dd, QNode *parent) : QAbstractLight(dd, parent) { diff --git a/src/render/lights/qpointlight.h b/src/render/lights/qpointlight.h index c5b9b2d51..16e048560 100644 --- a/src/render/lights/qpointlight.h +++ b/src/render/lights/qpointlight.h @@ -57,6 +57,7 @@ class QT3DRENDERSHARED_EXPORT QPointLight : public QAbstractLight public: explicit QPointLight(Qt3DCore::QNode *parent = nullptr); + ~QPointLight(); float constantAttenuation() const; float linearAttenuation() const; diff --git a/src/render/lights/qspotlight.cpp b/src/render/lights/qspotlight.cpp index 82dc793c5..aa2c8c201 100644 --- a/src/render/lights/qspotlight.cpp +++ b/src/render/lights/qspotlight.cpp @@ -101,6 +101,11 @@ QSpotLight::QSpotLight(QNode *parent) } /*! \internal */ +QSpotLight::~QSpotLight() +{ +} + +/*! \internal */ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent) : QAbstractLight(dd, parent) { diff --git a/src/render/lights/qspotlight.h b/src/render/lights/qspotlight.h index 846f8907e..8497740db 100644 --- a/src/render/lights/qspotlight.h +++ b/src/render/lights/qspotlight.h @@ -59,6 +59,7 @@ class QT3DRENDERSHARED_EXPORT QSpotLight : public QAbstractLight public: explicit QSpotLight(Qt3DCore::QNode *parent = nullptr); + ~QSpotLight(); QVector3D attenuation() const; QVector3D localDirection() const; diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp index b44cec18c..b82875dd1 100644 --- a/src/render/materialsystem/qeffect.cpp +++ b/src/render/materialsystem/qeffect.cpp @@ -63,6 +63,11 @@ QEffect::QEffect(QNode *parent) } /*! \internal */ +QEffect::~QEffect() +{ +} + +/*! \internal */ QEffect::QEffect(QEffectPrivate &dd, QNode *parent) : QNode(dd, parent) { diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h index c1a6b8552..549003608 100644 --- a/src/render/materialsystem/qeffect.h +++ b/src/render/materialsystem/qeffect.h @@ -56,6 +56,7 @@ class QT3DRENDERSHARED_EXPORT QEffect : public Qt3DCore::QNode Q_OBJECT public: explicit QEffect(Qt3DCore::QNode *parent = nullptr); + ~QEffect(); void addParameter(QParameter *parameter); void removeParameter(QParameter *parameter); diff --git a/src/render/materialsystem/qfilterkey.cpp b/src/render/materialsystem/qfilterkey.cpp index 5a75f9efc..edf96314c 100644 --- a/src/render/materialsystem/qfilterkey.cpp +++ b/src/render/materialsystem/qfilterkey.cpp @@ -76,6 +76,11 @@ QFilterKey::QFilterKey(QNode *parent) { } +/*! \internal */ +QFilterKey::~QFilterKey() +{ +} + void QFilterKey::setValue(const QVariant &value) { Q_D(QFilterKey); diff --git a/src/render/materialsystem/qfilterkey.h b/src/render/materialsystem/qfilterkey.h index e0a2ecb10..16db2a9e8 100644 --- a/src/render/materialsystem/qfilterkey.h +++ b/src/render/materialsystem/qfilterkey.h @@ -57,6 +57,7 @@ class QT3DRENDERSHARED_EXPORT QFilterKey : public Qt3DCore::QNode Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) public: explicit QFilterKey(Qt3DCore::QNode *parent = nullptr); + ~QFilterKey(); QVariant value() const; QString name() const; diff --git a/src/render/materialsystem/qgraphicsapifilter.cpp b/src/render/materialsystem/qgraphicsapifilter.cpp index e9c386fdd..7248b252f 100644 --- a/src/render/materialsystem/qgraphicsapifilter.cpp +++ b/src/render/materialsystem/qgraphicsapifilter.cpp @@ -105,6 +105,11 @@ QGraphicsApiFilter::QGraphicsApiFilter(QObject *parent) { } +/*! \internal */ +QGraphicsApiFilter::~QGraphicsApiFilter() +{ +} + /*! \enum Qt3DRender::QGraphicsApiFilter::Api diff --git a/src/render/materialsystem/qgraphicsapifilter.h b/src/render/materialsystem/qgraphicsapifilter.h index 445f31504..d09c2f753 100644 --- a/src/render/materialsystem/qgraphicsapifilter.h +++ b/src/render/materialsystem/qgraphicsapifilter.h @@ -77,6 +77,7 @@ public: Q_ENUM(OpenGLProfile) explicit QGraphicsApiFilter(QObject *parent = nullptr); + ~QGraphicsApiFilter(); Api api() const; OpenGLProfile profile() const; diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp index 7e8ed30d5..192167244 100644 --- a/src/render/materialsystem/qmaterial.cpp +++ b/src/render/materialsystem/qmaterial.cpp @@ -90,6 +90,11 @@ QMaterial::QMaterial(QNode *parent) } /*! \internal */ +QMaterial::~QMaterial() +{ +} + +/*! \internal */ QMaterial::QMaterial(QMaterialPrivate &dd, QNode *parent) : QComponent(dd, parent) { diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h index 674e62906..e11d30e5c 100644 --- a/src/render/materialsystem/qmaterial.h +++ b/src/render/materialsystem/qmaterial.h @@ -61,6 +61,7 @@ class QT3DRENDERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent public: explicit QMaterial(Qt3DCore::QNode *parent = nullptr); + ~QMaterial(); QEffect *effect() const; diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp index 332bd98a1..ae5981f5e 100644 --- a/src/render/materialsystem/qparameter.cpp +++ b/src/render/materialsystem/qparameter.cpp @@ -91,6 +91,10 @@ QParameter::QParameter(const QString &name, QAbstractTexture *texture, QNode *pa setValue(QVariant::fromValue(texture)); } +/*! \internal */ +QParameter::~QParameter() +{ +} void QParameter::setName(const QString &name) { diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h index d17d23a04..c742b5e22 100644 --- a/src/render/materialsystem/qparameter.h +++ b/src/render/materialsystem/qparameter.h @@ -61,6 +61,7 @@ public: explicit QParameter(Qt3DCore::QNode *parent = nullptr); explicit QParameter(const QString &name, const QVariant& value, Qt3DCore::QNode *parent = nullptr); explicit QParameter(const QString &name, QAbstractTexture *texture, Qt3DCore::QNode *parent = nullptr); + ~QParameter(); QString name() const; QVariant value() const; diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp index 7999661c4..69098f9ec 100644 --- a/src/render/materialsystem/qrenderpass.cpp +++ b/src/render/materialsystem/qrenderpass.cpp @@ -66,6 +66,11 @@ QRenderPass::QRenderPass(QNode *parent) } /*! \internal */ +QRenderPass::~QRenderPass() +{ +} + +/*! \internal */ QRenderPass::QRenderPass(QRenderPassPrivate &dd, QNode *parent) : QNode(dd, parent) { diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h index e1e4aa561..e2eb96a9a 100644 --- a/src/render/materialsystem/qrenderpass.h +++ b/src/render/materialsystem/qrenderpass.h @@ -66,6 +66,7 @@ class QT3DRENDERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode public: explicit QRenderPass(Qt3DCore::QNode *parent = nullptr); + ~QRenderPass(); QShaderProgram *shaderProgram() const; diff --git a/src/render/materialsystem/qshaderdata.cpp b/src/render/materialsystem/qshaderdata.cpp index 331401b45..6dfb182d1 100644 --- a/src/render/materialsystem/qshaderdata.cpp +++ b/src/render/materialsystem/qshaderdata.cpp @@ -44,6 +44,10 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { +PropertyReaderInterface::~PropertyReaderInterface() +{ +} + QShaderDataPrivate::QShaderDataPrivate() : QComponentPrivate() , m_propertyReader(PropertyReaderInterfacePtr(new QShaderDataPropertyReader())) @@ -76,6 +80,11 @@ QShaderData::QShaderData(QNode *parent) { } +/*! \internal */ +QShaderData::~QShaderData() +{ +} + PropertyReaderInterfacePtr QShaderData::propertyReader() const { Q_D(const QShaderData); diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h index 347790dde..767f4043f 100644 --- a/src/render/materialsystem/qshaderdata.h +++ b/src/render/materialsystem/qshaderdata.h @@ -53,7 +53,7 @@ class QShaderDataPrivate; class QT3DRENDERSHARED_EXPORT PropertyReaderInterface { public: - virtual ~PropertyReaderInterface() {} + virtual ~PropertyReaderInterface(); virtual QVariant readProperty(const QVariant &v) = 0; }; @@ -64,6 +64,7 @@ class QT3DRENDERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent Q_OBJECT public: explicit QShaderData(Qt3DCore::QNode *parent = nullptr); + ~QShaderData(); PropertyReaderInterfacePtr propertyReader() const; diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp index abfbdd4db..ae722f7ec 100644 --- a/src/render/materialsystem/qshaderprogram.cpp +++ b/src/render/materialsystem/qshaderprogram.cpp @@ -61,6 +61,11 @@ QShaderProgram::QShaderProgram(QNode *parent) } /*! \internal */ +QShaderProgram::~QShaderProgram() +{ +} + +/*! \internal */ QShaderProgram::QShaderProgram(QShaderProgramPrivate &dd, QNode *parent) : QNode(dd, parent) { diff --git a/src/render/materialsystem/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h index 9cabaa3cc..f5a577de5 100644 --- a/src/render/materialsystem/qshaderprogram.h +++ b/src/render/materialsystem/qshaderprogram.h @@ -61,6 +61,7 @@ class QT3DRENDERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode public: explicit QShaderProgram(Qt3DCore::QNode *parent = nullptr); + ~QShaderProgram(); enum ShaderType { Vertex = 0, diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp index 5d96a4adb..f2d146202 100644 --- a/src/render/materialsystem/qtechnique.cpp +++ b/src/render/materialsystem/qtechnique.cpp @@ -68,6 +68,11 @@ QTechnique::QTechnique(QNode *parent) } /*! \internal */ +QTechnique::~QTechnique() +{ +} + +/*! \internal */ QTechnique::QTechnique(QTechniquePrivate &dd, QNode *parent) : QNode(dd, parent) { diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h index 72ad941c0..cf5c034e8 100644 --- a/src/render/materialsystem/qtechnique.h +++ b/src/render/materialsystem/qtechnique.h @@ -62,6 +62,7 @@ class QT3DRENDERSHARED_EXPORT QTechnique : public Qt3DCore::QNode public: explicit QTechnique(Qt3DCore::QNode *parent = nullptr); + ~QTechnique(); void addFilterKey(QFilterKey *filterKey); void removeFilterKey(QFilterKey *filterKey); diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp index 11bb3e3cd..2eb981d69 100644 --- a/src/render/picking/qobjectpicker.cpp +++ b/src/render/picking/qobjectpicker.cpp @@ -94,6 +94,11 @@ QObjectPicker::QObjectPicker(Qt3DCore::QNode *parent) { } +/*! \internal */ +QObjectPicker::~QObjectPicker() +{ +} + void QObjectPicker::setHoverEnabled(bool hoverEnabled) { Q_D(QObjectPicker); diff --git a/src/render/picking/qobjectpicker.h b/src/render/picking/qobjectpicker.h index 526299c6c..950fff2cc 100644 --- a/src/render/picking/qobjectpicker.h +++ b/src/render/picking/qobjectpicker.h @@ -61,6 +61,7 @@ class QT3DRENDERSHARED_EXPORT QObjectPicker : public Qt3DCore::QComponent public: explicit QObjectPicker(QNode *parent = nullptr); + ~QObjectPicker(); bool isHoverEnabled() const; bool isDragEnabled() const; diff --git a/src/render/renderstates/qalphacoverage.cpp b/src/render/renderstates/qalphacoverage.cpp index d5ced01fc..2707b1edc 100644 --- a/src/render/renderstates/qalphacoverage.cpp +++ b/src/render/renderstates/qalphacoverage.cpp @@ -60,6 +60,11 @@ QAlphaCoverage::QAlphaCoverage(QNode *parent) { } +/*! \internal */ +QAlphaCoverage::~QAlphaCoverage() +{ +} + } // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/renderstates/qalphacoverage.h b/src/render/renderstates/qalphacoverage.h index e74a6b823..53636d300 100644 --- a/src/render/renderstates/qalphacoverage.h +++ b/src/render/renderstates/qalphacoverage.h @@ -54,6 +54,7 @@ class QT3DRENDERSHARED_EXPORT QAlphaCoverage : public QRenderState Q_OBJECT public: explicit QAlphaCoverage(Qt3DCore::QNode *parent = nullptr); + ~QAlphaCoverage(); private: Q_DECLARE_PRIVATE(QAlphaCoverage) diff --git a/src/render/renderstates/qalphatest.cpp b/src/render/renderstates/qalphatest.cpp index d6b4d03b7..9f60ceac6 100644 --- a/src/render/renderstates/qalphatest.cpp +++ b/src/render/renderstates/qalphatest.cpp @@ -51,6 +51,11 @@ QAlphaTest::QAlphaTest(QNode *parent) { } +/*! \internal */ +QAlphaTest::~QAlphaTest() +{ +} + QAlphaTest::AlphaFunction QAlphaTest::alphaFunction() const { Q_D(const QAlphaTest); diff --git a/src/render/renderstates/qalphatest.h b/src/render/renderstates/qalphatest.h index 02c0db54b..49a5fac43 100644 --- a/src/render/renderstates/qalphatest.h +++ b/src/render/renderstates/qalphatest.h @@ -69,6 +69,7 @@ public: Q_ENUM(AlphaFunction) explicit QAlphaTest(Qt3DCore::QNode *parent = nullptr); + ~QAlphaTest(); AlphaFunction alphaFunction() const; float referenceValue() const; diff --git a/src/render/renderstates/qblendequation.cpp b/src/render/renderstates/qblendequation.cpp index 5062b157d..fef531f20 100644 --- a/src/render/renderstates/qblendequation.cpp +++ b/src/render/renderstates/qblendequation.cpp @@ -51,6 +51,11 @@ QBlendEquation::QBlendEquation(QNode *parent) { } +/*! \internal */ +QBlendEquation::~QBlendEquation() +{ +} + QBlendEquation::BlendFunction QBlendEquation::blendFunction() const { Q_D(const QBlendEquation); diff --git a/src/render/renderstates/qblendequation.h b/src/render/renderstates/qblendequation.h index b433bfbb0..6810cf96e 100644 --- a/src/render/renderstates/qblendequation.h +++ b/src/render/renderstates/qblendequation.h @@ -66,6 +66,7 @@ public: Q_ENUM(BlendFunction) explicit QBlendEquation(Qt3DCore::QNode *parent = nullptr); + ~QBlendEquation(); BlendFunction blendFunction() const; diff --git a/src/render/renderstates/qblendequationarguments.cpp b/src/render/renderstates/qblendequationarguments.cpp index 7983b9c0a..a57c19b76 100644 --- a/src/render/renderstates/qblendequationarguments.cpp +++ b/src/render/renderstates/qblendequationarguments.cpp @@ -86,6 +86,13 @@ QBlendEquationArguments::QBlendEquationArguments(QNode *parent) /*! \internal */ +QBlendEquationArguments::~QBlendEquationArguments() +{ +} + +/*! + \internal +*/ QBlendEquationArguments::QBlendEquationArguments(QBlendEquationArgumentsPrivate &dd, QNode *parent) : QRenderState(dd, parent) { diff --git a/src/render/renderstates/qblendequationarguments.h b/src/render/renderstates/qblendequationarguments.h index e8107fa47..8e2f86f6c 100644 --- a/src/render/renderstates/qblendequationarguments.h +++ b/src/render/renderstates/qblendequationarguments.h @@ -85,6 +85,7 @@ public: Q_ENUM(Blending) explicit QBlendEquationArguments(Qt3DCore::QNode *parent = nullptr); + ~QBlendEquationArguments(); Blending sourceRgb() const; Blending destinationRgb() const; diff --git a/src/render/renderstates/qclipplane.cpp b/src/render/renderstates/qclipplane.cpp index 2deab3bf1..f117d040a 100644 --- a/src/render/renderstates/qclipplane.cpp +++ b/src/render/renderstates/qclipplane.cpp @@ -78,6 +78,11 @@ QClipPlane::QClipPlane(QNode *parent) { } +/*! \internal */ +QClipPlane::~QClipPlane() +{ +} + /*! * Returns the index of the clip plane. * \note usually between 0-7 diff --git a/src/render/renderstates/qclipplane.h b/src/render/renderstates/qclipplane.h index 001fa7333..46c44ad44 100644 --- a/src/render/renderstates/qclipplane.h +++ b/src/render/renderstates/qclipplane.h @@ -57,6 +57,7 @@ class QT3DRENDERSHARED_EXPORT QClipPlane : public QRenderState Q_PROPERTY(float distance READ distance WRITE setDistance NOTIFY distanceChanged) public: explicit QClipPlane(Qt3DCore::QNode *parent = nullptr); + ~QClipPlane(); int planeIndex() const; QVector3D normal() const; diff --git a/src/render/renderstates/qcolormask.cpp b/src/render/renderstates/qcolormask.cpp index da231dc2d..71819db94 100644 --- a/src/render/renderstates/qcolormask.cpp +++ b/src/render/renderstates/qcolormask.cpp @@ -67,6 +67,11 @@ QColorMask::QColorMask(QNode *parent) { } +/*! \internal */ +QColorMask::~QColorMask() +{ +} + bool QColorMask::isRedMasked() const { Q_D(const QColorMask); diff --git a/src/render/renderstates/qcolormask.h b/src/render/renderstates/qcolormask.h index eb6e56d1f..d42f87df0 100644 --- a/src/render/renderstates/qcolormask.h +++ b/src/render/renderstates/qcolormask.h @@ -58,6 +58,7 @@ class QT3DRENDERSHARED_EXPORT QColorMask : public QRenderState public: explicit QColorMask(Qt3DCore::QNode *parent = nullptr); + ~QColorMask(); bool isRedMasked() const; bool isGreenMasked() const; diff --git a/src/render/renderstates/qcullface.cpp b/src/render/renderstates/qcullface.cpp index cebb55761..6406da91c 100644 --- a/src/render/renderstates/qcullface.cpp +++ b/src/render/renderstates/qcullface.cpp @@ -51,6 +51,11 @@ QCullFace::QCullFace(QNode *parent) { } +/*! \internal */ +QCullFace::~QCullFace() +{ +} + QCullFace::CullingMode QCullFace::mode() const { Q_D(const QCullFace); diff --git a/src/render/renderstates/qcullface.h b/src/render/renderstates/qcullface.h index 9b175685f..3474fe009 100644 --- a/src/render/renderstates/qcullface.h +++ b/src/render/renderstates/qcullface.h @@ -67,6 +67,7 @@ public: Q_ENUM(CullingMode) explicit QCullFace(Qt3DCore::QNode *parent = nullptr); + ~QCullFace(); CullingMode mode() const; diff --git a/src/render/renderstates/qdepthtest.cpp b/src/render/renderstates/qdepthtest.cpp index 00207c824..5a4454d17 100644 --- a/src/render/renderstates/qdepthtest.cpp +++ b/src/render/renderstates/qdepthtest.cpp @@ -51,6 +51,11 @@ QDepthTest::QDepthTest(QNode *parent) { } +/*! \internal */ +QDepthTest::~QDepthTest() +{ +} + QDepthTest::DepthFunction QDepthTest::depthFunction() const { Q_D(const QDepthTest); diff --git a/src/render/renderstates/qdepthtest.h b/src/render/renderstates/qdepthtest.h index 51929629f..16b4a5b85 100644 --- a/src/render/renderstates/qdepthtest.h +++ b/src/render/renderstates/qdepthtest.h @@ -68,6 +68,7 @@ public: Q_ENUM(DepthFunction) explicit QDepthTest(Qt3DCore::QNode *parent = nullptr); + ~QDepthTest(); DepthFunction depthFunction() const; diff --git a/src/render/renderstates/qdithering.cpp b/src/render/renderstates/qdithering.cpp index 072699bea..4b1176330 100644 --- a/src/render/renderstates/qdithering.cpp +++ b/src/render/renderstates/qdithering.cpp @@ -62,6 +62,11 @@ QDithering::QDithering(QNode *parent) { } +/*! \internal */ +QDithering::~QDithering() +{ +} + } // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/renderstates/qdithering.h b/src/render/renderstates/qdithering.h index 538c98e4d..db6667f8a 100644 --- a/src/render/renderstates/qdithering.h +++ b/src/render/renderstates/qdithering.h @@ -54,6 +54,7 @@ class QT3DRENDERSHARED_EXPORT QDithering : public QRenderState Q_OBJECT public: explicit QDithering(Qt3DCore::QNode *parent = nullptr); + ~QDithering(); private: Q_DECLARE_PRIVATE(QDithering) diff --git a/src/render/renderstates/qfrontface.cpp b/src/render/renderstates/qfrontface.cpp index e5efcb882..49942ff0d 100644 --- a/src/render/renderstates/qfrontface.cpp +++ b/src/render/renderstates/qfrontface.cpp @@ -51,6 +51,11 @@ QFrontFace::QFrontFace(QNode *parent) { } +/*! \internal */ +QFrontFace::~QFrontFace() +{ +} + QFrontFace::WindingDirection QFrontFace::direction() const { Q_D(const QFrontFace); diff --git a/src/render/renderstates/qfrontface.h b/src/render/renderstates/qfrontface.h index 8a7258504..dd8a7f5fe 100644 --- a/src/render/renderstates/qfrontface.h +++ b/src/render/renderstates/qfrontface.h @@ -63,6 +63,7 @@ public: Q_ENUM(WindingDirection) explicit QFrontFace(Qt3DCore::QNode *parent = nullptr); + ~QFrontFace(); WindingDirection direction() const; diff --git a/src/render/renderstates/qmultisampleantialiasing.cpp b/src/render/renderstates/qmultisampleantialiasing.cpp index 501c800ec..6697bdbf5 100644 --- a/src/render/renderstates/qmultisampleantialiasing.cpp +++ b/src/render/renderstates/qmultisampleantialiasing.cpp @@ -62,6 +62,11 @@ QMultiSampleAntiAliasing::QMultiSampleAntiAliasing(QNode *parent) { } +/*! \internal */ +QMultiSampleAntiAliasing::~QMultiSampleAntiAliasing() +{ +} + } // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/renderstates/qmultisampleantialiasing.h b/src/render/renderstates/qmultisampleantialiasing.h index fa672189b..087f32ce2 100644 --- a/src/render/renderstates/qmultisampleantialiasing.h +++ b/src/render/renderstates/qmultisampleantialiasing.h @@ -54,6 +54,7 @@ class QT3DRENDERSHARED_EXPORT QMultiSampleAntiAliasing : public QRenderState public: explicit QMultiSampleAntiAliasing(Qt3DCore::QNode *parent = nullptr); + ~QMultiSampleAntiAliasing(); private: Q_DECLARE_PRIVATE(QMultiSampleAntiAliasing) diff --git a/src/render/renderstates/qnodepthmask.cpp b/src/render/renderstates/qnodepthmask.cpp index 9b471cd72..4e0975310 100644 --- a/src/render/renderstates/qnodepthmask.cpp +++ b/src/render/renderstates/qnodepthmask.cpp @@ -63,6 +63,11 @@ QNoDepthMask::QNoDepthMask(QNode *parent) { } +/*! \internal */ +QNoDepthMask::~QNoDepthMask() +{ +} + } // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/renderstates/qnodepthmask.h b/src/render/renderstates/qnodepthmask.h index 8e3cc8d76..20171595e 100644 --- a/src/render/renderstates/qnodepthmask.h +++ b/src/render/renderstates/qnodepthmask.h @@ -54,6 +54,7 @@ class QT3DRENDERSHARED_EXPORT QNoDepthMask : public QRenderState Q_OBJECT public: explicit QNoDepthMask(Qt3DCore::QNode *parent = nullptr); + ~QNoDepthMask(); private: Q_DECLARE_PRIVATE(QNoDepthMask) diff --git a/src/render/renderstates/qpointsize.cpp b/src/render/renderstates/qpointsize.cpp index 908940e0f..8aa2d7e0c 100644 --- a/src/render/renderstates/qpointsize.cpp +++ b/src/render/renderstates/qpointsize.cpp @@ -61,6 +61,11 @@ QPointSize::QPointSize(Qt3DCore::QNode *parent) { } +/*! \internal */ +QPointSize::~QPointSize() +{ +} + QPointSize::SizeMode QPointSize::sizeMode() const { Q_D(const QPointSize); diff --git a/src/render/renderstates/qpointsize.h b/src/render/renderstates/qpointsize.h index 51a4e9674..fdfa54a9c 100644 --- a/src/render/renderstates/qpointsize.h +++ b/src/render/renderstates/qpointsize.h @@ -61,6 +61,7 @@ public: Q_ENUM(SizeMode) explicit QPointSize(Qt3DCore::QNode *parent = nullptr); + ~QPointSize(); SizeMode sizeMode() const; float value() const; diff --git a/src/render/renderstates/qpolygonoffset.cpp b/src/render/renderstates/qpolygonoffset.cpp index edada68ae..b71e803fd 100644 --- a/src/render/renderstates/qpolygonoffset.cpp +++ b/src/render/renderstates/qpolygonoffset.cpp @@ -50,6 +50,11 @@ QPolygonOffset::QPolygonOffset(QNode *parent) { } +/*! \internal */ +QPolygonOffset::~QPolygonOffset() +{ +} + float QPolygonOffset::scaleFactor() const { Q_D(const QPolygonOffset); diff --git a/src/render/renderstates/qpolygonoffset.h b/src/render/renderstates/qpolygonoffset.h index eb78c39e8..3be117fb3 100644 --- a/src/render/renderstates/qpolygonoffset.h +++ b/src/render/renderstates/qpolygonoffset.h @@ -56,6 +56,7 @@ class QT3DRENDERSHARED_EXPORT QPolygonOffset : public QRenderState Q_PROPERTY(float depthSteps READ depthSteps WRITE setDepthSteps NOTIFY depthStepsChanged) public: explicit QPolygonOffset(Qt3DCore::QNode *parent = nullptr); + ~QPolygonOffset(); float scaleFactor() const; float depthSteps() const; diff --git a/src/render/renderstates/qrenderstate.cpp b/src/render/renderstates/qrenderstate.cpp index 16524365f..ce2f67f11 100644 --- a/src/render/renderstates/qrenderstate.cpp +++ b/src/render/renderstates/qrenderstate.cpp @@ -63,6 +63,11 @@ const QRenderStatePrivate *QRenderStatePrivate::get(const QRenderState *state) } /*! \internal */ +QRenderState::~QRenderState() +{ +} + +/*! \internal */ QRenderState::QRenderState(QRenderStatePrivate &dd, QNode *parent) : QNode(dd, parent) { diff --git a/src/render/renderstates/qrenderstate.h b/src/render/renderstates/qrenderstate.h index 6f40658b2..0ecc805e3 100644 --- a/src/render/renderstates/qrenderstate.h +++ b/src/render/renderstates/qrenderstate.h @@ -53,6 +53,8 @@ class QRenderStatePrivate; class QT3DRENDERSHARED_EXPORT QRenderState : public Qt3DCore::QNode { Q_OBJECT +public: + ~QRenderState(); protected: explicit QRenderState(QRenderStatePrivate &dd, Qt3DCore::QNode *parent = nullptr); diff --git a/src/render/renderstates/qscissortest.cpp b/src/render/renderstates/qscissortest.cpp index e56ac83e6..0897a52c4 100644 --- a/src/render/renderstates/qscissortest.cpp +++ b/src/render/renderstates/qscissortest.cpp @@ -51,6 +51,11 @@ QScissorTest::QScissorTest(QNode *parent) { } +/*! \internal */ +QScissorTest::~QScissorTest() +{ +} + int QScissorTest::left() const { Q_D(const QScissorTest); diff --git a/src/render/renderstates/qscissortest.h b/src/render/renderstates/qscissortest.h index b71aa6825..65327bd39 100644 --- a/src/render/renderstates/qscissortest.h +++ b/src/render/renderstates/qscissortest.h @@ -59,6 +59,7 @@ class QT3DRENDERSHARED_EXPORT QScissorTest : public QRenderState public: explicit QScissorTest(Qt3DCore::QNode *parent = nullptr); + ~QScissorTest(); int left() const; int bottom() const; diff --git a/src/render/renderstates/qseamlesscubemap.cpp b/src/render/renderstates/qseamlesscubemap.cpp index 881274c23..a017228b0 100644 --- a/src/render/renderstates/qseamlesscubemap.cpp +++ b/src/render/renderstates/qseamlesscubemap.cpp @@ -62,6 +62,11 @@ QSeamlessCubemap::QSeamlessCubemap(QNode *parent) { } +/*! \internal */ +QSeamlessCubemap::~QSeamlessCubemap() +{ +} + } // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/renderstates/qseamlesscubemap.h b/src/render/renderstates/qseamlesscubemap.h index 029c6d674..40ae0a955 100644 --- a/src/render/renderstates/qseamlesscubemap.h +++ b/src/render/renderstates/qseamlesscubemap.h @@ -54,6 +54,7 @@ class QT3DRENDERSHARED_EXPORT QSeamlessCubemap : public QRenderState public: explicit QSeamlessCubemap(Qt3DCore::QNode *parent = nullptr); + ~QSeamlessCubemap(); private: Q_DECLARE_PRIVATE(QSeamlessCubemap) diff --git a/src/render/renderstates/qstencilmask.cpp b/src/render/renderstates/qstencilmask.cpp index 79416eba9..445d25d1c 100644 --- a/src/render/renderstates/qstencilmask.cpp +++ b/src/render/renderstates/qstencilmask.cpp @@ -54,6 +54,11 @@ QStencilMask::QStencilMask(QNode *parent) { } +/*! \internal */ +QStencilMask::~QStencilMask() +{ +} + void QStencilMask::setFrontOutputMask(uint mask) { Q_D(QStencilMask); diff --git a/src/render/renderstates/qstencilmask.h b/src/render/renderstates/qstencilmask.h index f6214f508..e0487c4f3 100644 --- a/src/render/renderstates/qstencilmask.h +++ b/src/render/renderstates/qstencilmask.h @@ -55,6 +55,7 @@ class QT3DRENDERSHARED_EXPORT QStencilMask : public QRenderState Q_PROPERTY(uint backOutputMask READ backOutputMask WRITE setBackOutputMask NOTIFY backOutputMaskChanged) public: explicit QStencilMask(Qt3DCore::QNode *parent = nullptr); + ~QStencilMask(); uint frontOutputMask() const; uint backOutputMask() const; diff --git a/src/render/renderstates/qstenciloperation.cpp b/src/render/renderstates/qstenciloperation.cpp index 78281a8b3..cec14c041 100644 --- a/src/render/renderstates/qstenciloperation.cpp +++ b/src/render/renderstates/qstenciloperation.cpp @@ -51,6 +51,11 @@ QStencilOperation::QStencilOperation(QNode *parent) { } +/*! \internal */ +QStencilOperation::~QStencilOperation() +{ +} + QStencilOperationArguments *QStencilOperation::front() const { Q_D(const QStencilOperation); diff --git a/src/render/renderstates/qstenciloperation.h b/src/render/renderstates/qstenciloperation.h index 9d360a0e2..8a8491f59 100644 --- a/src/render/renderstates/qstenciloperation.h +++ b/src/render/renderstates/qstenciloperation.h @@ -57,6 +57,7 @@ class QT3DRENDERSHARED_EXPORT QStencilOperation : public QRenderState public: explicit QStencilOperation(Qt3DCore::QNode *parent = nullptr); + ~QStencilOperation(); QStencilOperationArguments *front() const; QStencilOperationArguments *back() const; diff --git a/src/render/renderstates/qstenciltest.cpp b/src/render/renderstates/qstenciltest.cpp index 21cf66d8a..649a78066 100644 --- a/src/render/renderstates/qstenciltest.cpp +++ b/src/render/renderstates/qstenciltest.cpp @@ -52,6 +52,11 @@ QStencilTest::QStencilTest(QNode *parent) { } +/*! \internal */ +QStencilTest::~QStencilTest() +{ +} + QStencilTestArguments *QStencilTest::front() const { Q_D(const QStencilTest); diff --git a/src/render/renderstates/qstenciltest.h b/src/render/renderstates/qstenciltest.h index c3c7af303..894a4f561 100644 --- a/src/render/renderstates/qstenciltest.h +++ b/src/render/renderstates/qstenciltest.h @@ -57,6 +57,7 @@ class QT3DRENDERSHARED_EXPORT QStencilTest : public QRenderState Q_PROPERTY(Qt3DRender::QStencilTestArguments *back READ back CONSTANT) public: explicit QStencilTest(Qt3DCore::QNode *parent = nullptr); + ~QStencilTest(); QStencilTestArguments *front() const; QStencilTestArguments *back() const; diff --git a/src/render/texture/qabstracttexture.cpp b/src/render/texture/qabstracttexture.cpp index ae1c6a468..557498b5c 100644 --- a/src/render/texture/qabstracttexture.cpp +++ b/src/render/texture/qabstracttexture.cpp @@ -94,6 +94,11 @@ QAbstractTexture::QAbstractTexture(Target target, QNode *parent) } /*! \internal */ +QAbstractTexture::~QAbstractTexture() +{ +} + +/*! \internal */ QAbstractTexture::QAbstractTexture(QAbstractTexturePrivate &dd, QNode *parent) : QNode(dd, parent) { diff --git a/src/render/texture/qabstracttexture.h b/src/render/texture/qabstracttexture.h index d8435ba81..854c19b75 100644 --- a/src/render/texture/qabstracttexture.h +++ b/src/render/texture/qabstracttexture.h @@ -266,6 +266,8 @@ public: }; Q_ENUM(ComparisonMode) + ~QAbstractTexture(); + Target target() const; TextureFormat format() const; diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp index c4def97a7..717a80100 100644 --- a/src/render/texture/qtextureimage.cpp +++ b/src/render/texture/qtextureimage.cpp @@ -75,6 +75,11 @@ QTextureImage::QTextureImage(QNode *parent) { } +/*! \internal */ +QTextureImage::~QTextureImage() +{ +} + /*! Returns the source url from which data for the texture image will be loaded. */ diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h index c7a47fff2..f614ebdab 100644 --- a/src/render/texture/qtextureimage.h +++ b/src/render/texture/qtextureimage.h @@ -57,6 +57,7 @@ class QT3DRENDERSHARED_EXPORT QTextureImage : public QAbstractTextureImage public: explicit QTextureImage(Qt3DCore::QNode *parent = nullptr); + ~QTextureImage(); enum Status { None = 0, diff --git a/src/render/texture/qtexturewrapmode.cpp b/src/render/texture/qtexturewrapmode.cpp index 96b59aa53..ee831f409 100644 --- a/src/render/texture/qtexturewrapmode.cpp +++ b/src/render/texture/qtexturewrapmode.cpp @@ -90,6 +90,11 @@ QTextureWrapMode::QTextureWrapMode(WrapMode x,WrapMode y, WrapMode z, QObject *p d_func()->m_z = z; } +/*! \internal */ +QTextureWrapMode::~QTextureWrapMode() +{ +} + /*! Sets the wrap mode of the x dimension to \a x. */ diff --git a/src/render/texture/qtexturewrapmode.h b/src/render/texture/qtexturewrapmode.h index 869e4e949..bb27acf4a 100644 --- a/src/render/texture/qtexturewrapmode.h +++ b/src/render/texture/qtexturewrapmode.h @@ -67,6 +67,7 @@ public: explicit QTextureWrapMode(WrapMode wrapMode = ClampToEdge, QObject *parent = nullptr); explicit QTextureWrapMode(WrapMode x, WrapMode y, WrapMode z, QObject *parent = nullptr); + ~QTextureWrapMode(); WrapMode x() const; WrapMode y() const; |