From f1a018c657d98b2e22436a083cc4a6821ea0f0ad Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 14 May 2016 09:32:38 +0200 Subject: De-inline some more dtors of non-leaf Private classes Change-Id: I2d80f964c4de6ef6cef144ca50fa12ffb3eb540c Reviewed-by: Paul Lemire --- src/core/transforms/qtransform.cpp | 4 ++++ src/core/transforms/qtransform_p.h | 1 + src/input/frontend/qkeyboardhandler.cpp | 4 ++++ src/input/frontend/qkeyboardhandler_p.h | 1 + src/input/frontend/qlogicaldevice.cpp | 9 +++++++++ src/input/frontend/qlogicaldevice_p.h | 5 ++--- src/input/frontend/qmousehandler.cpp | 4 ++++ src/input/frontend/qmousehandler_p.h | 1 + src/render/geometry/qgeometry.cpp | 14 +++++++++++--- src/render/geometry/qgeometry_p.h | 9 ++++----- src/render/geometry/qgeometryrenderer.cpp | 4 ++++ src/render/geometry/qgeometryrenderer_p.h | 2 ++ src/render/lights/qabstractlight.cpp | 4 ++++ src/render/lights/qabstractlight_p.h | 1 + src/render/materialsystem/qmaterial.cpp | 4 ++++ src/render/materialsystem/qmaterial_p.h | 1 + src/render/renderstates/qrenderstate.cpp | 4 ++++ src/render/renderstates/qrenderstate_p.h | 3 +++ src/render/texture/qabstracttextureimage.cpp | 11 +++++++++++ src/render/texture/qabstracttextureimage_p.h | 9 ++------- 20 files changed, 77 insertions(+), 18 deletions(-) diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp index 41d89cb82..55974a836 100644 --- a/src/core/transforms/qtransform.cpp +++ b/src/core/transforms/qtransform.cpp @@ -57,6 +57,10 @@ QTransformPrivate::QTransformPrivate() { } +QTransformPrivate::~QTransformPrivate() +{ +} + /*! * \qmltype Transform * \inqmlmodule Qt3D.Core diff --git a/src/core/transforms/qtransform_p.h b/src/core/transforms/qtransform_p.h index a758b44e5..8d1a60566 100644 --- a/src/core/transforms/qtransform_p.h +++ b/src/core/transforms/qtransform_p.h @@ -63,6 +63,7 @@ class QTransformPrivate : public QComponentPrivate public: QTransformPrivate(); + ~QTransformPrivate(); // Stored in this order as QQuaternion is bigger than QVector3D // Operations are applied in the order of: diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp index 647fc8650..a55e8ce9e 100644 --- a/src/input/frontend/qkeyboardhandler.cpp +++ b/src/input/frontend/qkeyboardhandler.cpp @@ -114,6 +114,10 @@ QKeyboardHandlerPrivate::QKeyboardHandlerPrivate() m_shareable = false; } +QKeyboardHandlerPrivate::~QKeyboardHandlerPrivate() +{ +} + void QKeyboardHandlerPrivate::keyEvent(QKeyEvent *event) { Q_Q(QKeyboardHandler); diff --git a/src/input/frontend/qkeyboardhandler_p.h b/src/input/frontend/qkeyboardhandler_p.h index a84e9f650..339d36d26 100644 --- a/src/input/frontend/qkeyboardhandler_p.h +++ b/src/input/frontend/qkeyboardhandler_p.h @@ -64,6 +64,7 @@ class QKeyboardHandlerPrivate : public Qt3DCore::QComponentPrivate { public: QKeyboardHandlerPrivate(); + ~QKeyboardHandlerPrivate(); void keyEvent(QKeyEvent *event); diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp index 3cb3a8b24..f84b45001 100644 --- a/src/input/frontend/qlogicaldevice.cpp +++ b/src/input/frontend/qlogicaldevice.cpp @@ -50,6 +50,15 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { +QLogicalDevicePrivate::QLogicalDevicePrivate() + : Qt3DCore::QComponentPrivate() +{ +} + +QLogicalDevicePrivate::~QLogicalDevicePrivate() +{ +} + /*! \class Qt3DInput::QLogicalDevice \inmodule Qt3DInput diff --git a/src/input/frontend/qlogicaldevice_p.h b/src/input/frontend/qlogicaldevice_p.h index 74f10f50a..c8940e6b9 100644 --- a/src/input/frontend/qlogicaldevice_p.h +++ b/src/input/frontend/qlogicaldevice_p.h @@ -64,9 +64,8 @@ namespace Qt3DInput { class QLogicalDevicePrivate : public Qt3DCore::QComponentPrivate { public: - QLogicalDevicePrivate() - : Qt3DCore::QComponentPrivate() - {} + QLogicalDevicePrivate(); + ~QLogicalDevicePrivate(); QVector m_actions; QVector m_axes; diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp index 7f135d10c..7fa7f9f2d 100644 --- a/src/input/frontend/qmousehandler.cpp +++ b/src/input/frontend/qmousehandler.cpp @@ -57,6 +57,10 @@ QMouseHandlerPrivate::QMouseHandlerPrivate() m_shareable = false; } +QMouseHandlerPrivate::~QMouseHandlerPrivate() +{ +} + void QMouseHandlerPrivate::mouseEvent(QMouseEvent *event) { Q_Q(QMouseHandler); diff --git a/src/input/frontend/qmousehandler_p.h b/src/input/frontend/qmousehandler_p.h index 5a794862b..a35fcb5d7 100644 --- a/src/input/frontend/qmousehandler_p.h +++ b/src/input/frontend/qmousehandler_p.h @@ -64,6 +64,7 @@ class QMouseHandlerPrivate : public Qt3DCore::QComponentPrivate { public: QMouseHandlerPrivate(); + ~QMouseHandlerPrivate(); QMouseDevice *m_mouseDevice; bool m_containsMouse; diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp index 9749faa71..57222a364 100644 --- a/src/render/geometry/qgeometry.cpp +++ b/src/render/geometry/qgeometry.cpp @@ -56,6 +56,16 @@ QGeometryFactory::~QGeometryFactory() { } +QGeometryPrivate::QGeometryPrivate() + : QNodePrivate(), + m_boundingVolumePositionAttribute(nullptr) +{ +} + +QGeometryPrivate::~QGeometryPrivate() +{ +} + /*! * \qmltype Geometry * \instantiates Qt3DRender::QGeometry @@ -87,9 +97,7 @@ QGeometryFactory::~QGeometryFactory() * Constructs a new QGeometry with \a parent. */ QGeometry::QGeometry(QNode *parent) - : QNode(*new QGeometryPrivate(), parent) -{ -} + : QGeometry(*new QGeometryPrivate(), parent) {} /*! * \internal diff --git a/src/render/geometry/qgeometry_p.h b/src/render/geometry/qgeometry_p.h index 41d58f494..e07b9ff0d 100644 --- a/src/render/geometry/qgeometry_p.h +++ b/src/render/geometry/qgeometry_p.h @@ -51,20 +51,19 @@ // We mean it. // +#include #include QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QGeometryPrivate : public Qt3DCore::QNodePrivate +class QT3DRENDERSHARED_PRIVATE_EXPORT QGeometryPrivate : public Qt3DCore::QNodePrivate { public: Q_DECLARE_PUBLIC(QGeometry) - QGeometryPrivate() - : QNodePrivate() - , m_boundingVolumePositionAttribute(nullptr) - {} + QGeometryPrivate(); + ~QGeometryPrivate(); QVector m_attributes; diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index 97cf4836c..a714c3155 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -66,6 +66,10 @@ QGeometryRendererPrivate::QGeometryRendererPrivate() { } +QGeometryRendererPrivate::~QGeometryRendererPrivate() +{ +} + /*! * \qmltype GeometryRenderer * \instantiates Qt3DRender::QGeometryRenderer diff --git a/src/render/geometry/qgeometryrenderer_p.h b/src/render/geometry/qgeometryrenderer_p.h index 905f99b8e..622cfb254 100644 --- a/src/render/geometry/qgeometryrenderer_p.h +++ b/src/render/geometry/qgeometryrenderer_p.h @@ -65,6 +65,8 @@ class QGeometryRendererPrivate : public Qt3DCore::QComponentPrivate { public: QGeometryRendererPrivate(); + ~QGeometryRendererPrivate(); + Q_DECLARE_PUBLIC(QGeometryRenderer) int m_instanceCount; diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp index e3d0d86bf..0f8e5c19f 100644 --- a/src/render/lights/qabstractlight.cpp +++ b/src/render/lights/qabstractlight.cpp @@ -61,6 +61,10 @@ QAbstractLightPrivate::QAbstractLightPrivate(QAbstractLight::Type type) m_shaderData->setProperty("type", type); } +QAbstractLightPrivate::~QAbstractLightPrivate() +{ +} + Qt3DCore::QNodeCreatedChangeBasePtr QAbstractLight::createNodeCreationChange() const { auto creationChange = Qt3DCore::QNodeCreatedChangePtr::create(this); diff --git a/src/render/lights/qabstractlight_p.h b/src/render/lights/qabstractlight_p.h index 1e5ce588f..bfab787a3 100644 --- a/src/render/lights/qabstractlight_p.h +++ b/src/render/lights/qabstractlight_p.h @@ -64,6 +64,7 @@ class Q_AUTOTEST_EXPORT QAbstractLightPrivate : public Qt3DCore::QComponentPriva { public: explicit QAbstractLightPrivate(QAbstractLight::Type type); + ~QAbstractLightPrivate(); Q_DECLARE_PUBLIC(QAbstractLight) QAbstractLight::Type m_type; diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp index 192167244..644c11b4d 100644 --- a/src/render/materialsystem/qmaterial.cpp +++ b/src/render/materialsystem/qmaterial.cpp @@ -84,6 +84,10 @@ QMaterialPrivate::QMaterialPrivate() { } +QMaterialPrivate::~QMaterialPrivate() +{ +} + QMaterial::QMaterial(QNode *parent) : QComponent(*new QMaterialPrivate, parent) { diff --git a/src/render/materialsystem/qmaterial_p.h b/src/render/materialsystem/qmaterial_p.h index 4368342ed..9fb8d5de9 100644 --- a/src/render/materialsystem/qmaterial_p.h +++ b/src/render/materialsystem/qmaterial_p.h @@ -65,6 +65,7 @@ class QT3DRENDERSHARED_PRIVATE_EXPORT QMaterialPrivate : public Qt3DCore::QCompo { public: QMaterialPrivate(); + ~QMaterialPrivate(); Q_DECLARE_PUBLIC(QMaterial) QVector m_parameters; diff --git a/src/render/renderstates/qrenderstate.cpp b/src/render/renderstates/qrenderstate.cpp index ce2f67f11..0367b6fc2 100644 --- a/src/render/renderstates/qrenderstate.cpp +++ b/src/render/renderstates/qrenderstate.cpp @@ -52,6 +52,10 @@ QRenderStatePrivate::QRenderStatePrivate(Type type) { } +QRenderStatePrivate::~QRenderStatePrivate() +{ +} + QRenderStatePrivate *QRenderStatePrivate::get(QRenderState *state) { return state->d_func(); diff --git a/src/render/renderstates/qrenderstate_p.h b/src/render/renderstates/qrenderstate_p.h index d59a2791c..1ec672cac 100644 --- a/src/render/renderstates/qrenderstate_p.h +++ b/src/render/renderstates/qrenderstate_p.h @@ -86,6 +86,9 @@ public: }; QRenderStatePrivate(Type type); + ~QRenderStatePrivate(); + + Q_DECLARE_PUBLIC(QRenderState) diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp index b79ade739..d8cc89f87 100644 --- a/src/render/texture/qabstracttextureimage.cpp +++ b/src/render/texture/qabstracttextureimage.cpp @@ -47,6 +47,17 @@ using namespace Qt3DCore; namespace Qt3DRender { +QAbstractTextureImagePrivate::QAbstractTextureImagePrivate() + : QNodePrivate(), + m_mipLevel(0), + m_layer(0), + m_face(QAbstractTexture::CubeMapPositiveX) +{ +} + +QAbstractTextureImagePrivate::~QAbstractTextureImagePrivate() +{ +} /*! \qmltype AbstractTextureImage diff --git a/src/render/texture/qabstracttextureimage_p.h b/src/render/texture/qabstracttextureimage_p.h index 5630643d8..f0d836055 100644 --- a/src/render/texture/qabstracttextureimage_p.h +++ b/src/render/texture/qabstracttextureimage_p.h @@ -64,13 +64,8 @@ class QAbstractTextureImage; class QT3DRENDERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3DCore::QNodePrivate { public: - QAbstractTextureImagePrivate() - : QNodePrivate() - , m_mipLevel(0) - , m_layer(0) - , m_face(QAbstractTexture::CubeMapPositiveX) - { - } + QAbstractTextureImagePrivate(); + ~QAbstractTextureImagePrivate(); Q_DECLARE_PUBLIC(QAbstractTextureImage) -- cgit v1.2.3