diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 12:05:23 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:09:06 +0000 |
commit | 1a1b825f97a18146e7318401b1e25e79e416cbc4 (patch) | |
tree | 358a2cfcf19d66f85fbee68c6c4838985265462c | |
parent | 68817e1a5c7f1e9e04b4978ea79fd80047d239b1 (diff) |
Make ctors explicit, provide out of line dtors and export classes
...for immediate subclasses of QSceneChange.
Task-number: QTBUG-51494
Change-Id: I7480d892ed2040c90e7ab056dee06198be085a9b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r-- | src/core/changes/qcomponentaddedchange.cpp | 4 | ||||
-rw-r--r-- | src/core/changes/qcomponentaddedchange.h | 5 | ||||
-rw-r--r-- | src/core/changes/qcomponentremovedchange.cpp | 4 | ||||
-rw-r--r-- | src/core/changes/qcomponentremovedchange.h | 5 | ||||
-rw-r--r-- | src/core/changes/qnodedestroyedchange.cpp | 4 | ||||
-rw-r--r-- | src/core/changes/qnodedestroyedchange.h | 1 | ||||
-rw-r--r-- | src/core/changes/qnodeupdatedchangebase.cpp | 4 | ||||
-rw-r--r-- | src/core/changes/qnodeupdatedchangebase.h | 1 | ||||
-rw-r--r-- | src/core/changes/qpropertyvalueaddedchangebase.cpp | 4 | ||||
-rw-r--r-- | src/core/changes/qpropertyvalueaddedchangebase.h | 6 | ||||
-rw-r--r-- | src/core/changes/qpropertyvalueaddedchangebase_p.h | 3 | ||||
-rw-r--r-- | src/core/changes/qpropertyvalueremovedchangebase.cpp | 4 | ||||
-rw-r--r-- | src/core/changes/qpropertyvalueremovedchangebase.h | 6 | ||||
-rw-r--r-- | src/core/changes/qpropertyvalueremovedchangebase_p.h | 3 |
14 files changed, 46 insertions, 8 deletions
diff --git a/src/core/changes/qcomponentaddedchange.cpp b/src/core/changes/qcomponentaddedchange.cpp index 75f18c251..d88f4e060 100644 --- a/src/core/changes/qcomponentaddedchange.cpp +++ b/src/core/changes/qcomponentaddedchange.cpp @@ -62,6 +62,10 @@ QComponentAddedChange::QComponentAddedChange(const QEntity *entity, { } +QComponentAddedChange::~QComponentAddedChange() +{ +} + QNodeId QComponentAddedChange::entityId() const Q_DECL_NOEXCEPT { Q_D(const QComponentAddedChange); diff --git a/src/core/changes/qcomponentaddedchange.h b/src/core/changes/qcomponentaddedchange.h index 481f64233..73d3572b3 100644 --- a/src/core/changes/qcomponentaddedchange.h +++ b/src/core/changes/qcomponentaddedchange.h @@ -53,8 +53,9 @@ class QComponentAddedChangePrivate; class QT3DCORESHARED_EXPORT QComponentAddedChange : public QSceneChange { public: - QComponentAddedChange(const QEntity *entity, - const QComponent *component); + explicit QComponentAddedChange(const QEntity *entity, + const QComponent *component); + ~QComponentAddedChange(); QNodeId entityId() const Q_DECL_NOEXCEPT; QNodeId componentId() const Q_DECL_NOEXCEPT; diff --git a/src/core/changes/qcomponentremovedchange.cpp b/src/core/changes/qcomponentremovedchange.cpp index 43eee53fc..495bb6443 100644 --- a/src/core/changes/qcomponentremovedchange.cpp +++ b/src/core/changes/qcomponentremovedchange.cpp @@ -62,6 +62,10 @@ QComponentRemovedChange::QComponentRemovedChange(const QEntity *entity, { } +QComponentRemovedChange::~QComponentRemovedChange() +{ +} + QNodeId QComponentRemovedChange::entityId() const Q_DECL_NOEXCEPT { Q_D(const QComponentRemovedChange); diff --git a/src/core/changes/qcomponentremovedchange.h b/src/core/changes/qcomponentremovedchange.h index 8fa4f536a..0d968c6ff 100644 --- a/src/core/changes/qcomponentremovedchange.h +++ b/src/core/changes/qcomponentremovedchange.h @@ -53,8 +53,9 @@ class QComponentRemovedChangePrivate; class QT3DCORESHARED_EXPORT QComponentRemovedChange : public QSceneChange { public: - QComponentRemovedChange(const QEntity *entity, - const QComponent *component); + explicit QComponentRemovedChange(const QEntity *entity, + const QComponent *component); + ~QComponentRemovedChange(); QNodeId entityId() const Q_DECL_NOEXCEPT; QNodeId componentId() const Q_DECL_NOEXCEPT; diff --git a/src/core/changes/qnodedestroyedchange.cpp b/src/core/changes/qnodedestroyedchange.cpp index 309c70ebe..105070831 100644 --- a/src/core/changes/qnodedestroyedchange.cpp +++ b/src/core/changes/qnodedestroyedchange.cpp @@ -46,6 +46,10 @@ QNodeDestroyedChange::QNodeDestroyedChange(const QNode *node, const QVector<QNod { } +QNodeDestroyedChange::~QNodeDestroyedChange() +{ +} + } // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/changes/qnodedestroyedchange.h b/src/core/changes/qnodedestroyedchange.h index e47ca41cd..3fb4e59e5 100644 --- a/src/core/changes/qnodedestroyedchange.h +++ b/src/core/changes/qnodedestroyedchange.h @@ -49,6 +49,7 @@ class QT3DCORESHARED_EXPORT QNodeDestroyedChange : public QSceneChange { public: explicit QNodeDestroyedChange(const QNode *node, const QVector<QNodeIdTypePair> &subtreeIdsAndTypes); + ~QNodeDestroyedChange(); QVector<QNodeIdTypePair> subtreeIdsAndTypes() const { return m_subtreeIdsAndTypes; } diff --git a/src/core/changes/qnodeupdatedchangebase.cpp b/src/core/changes/qnodeupdatedchangebase.cpp index ab69bc026..84a3bb0f1 100644 --- a/src/core/changes/qnodeupdatedchangebase.cpp +++ b/src/core/changes/qnodeupdatedchangebase.cpp @@ -87,6 +87,10 @@ QNodeUpdatedChangeBase::QNodeUpdatedChangeBase(QNodeUpdatedChangeBasePrivate &dd { } +QNodeUpdatedChangeBase::~QNodeUpdatedChangeBase() +{ +} + } // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/changes/qnodeupdatedchangebase.h b/src/core/changes/qnodeupdatedchangebase.h index f9109efef..5e0f4fe99 100644 --- a/src/core/changes/qnodeupdatedchangebase.h +++ b/src/core/changes/qnodeupdatedchangebase.h @@ -53,6 +53,7 @@ class QNodeUpdatedChangeBase : public QSceneChange { public: explicit QNodeUpdatedChangeBase(QNodeId subjectId); + ~QNodeUpdatedChangeBase(); protected: Q_DECLARE_PRIVATE(QNodeUpdatedChangeBase) diff --git a/src/core/changes/qpropertyvalueaddedchangebase.cpp b/src/core/changes/qpropertyvalueaddedchangebase.cpp index f73482a51..f982f6d5f 100644 --- a/src/core/changes/qpropertyvalueaddedchangebase.cpp +++ b/src/core/changes/qpropertyvalueaddedchangebase.cpp @@ -88,6 +88,10 @@ QPropertyValueAddedChangeBase::QPropertyValueAddedChangeBase(QPropertyValueAdded { } +QPropertyValueAddedChangeBase::~QPropertyValueAddedChangeBase() +{ +} + } // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/changes/qpropertyvalueaddedchangebase.h b/src/core/changes/qpropertyvalueaddedchangebase.h index 29ea2ff71..69ce67315 100644 --- a/src/core/changes/qpropertyvalueaddedchangebase.h +++ b/src/core/changes/qpropertyvalueaddedchangebase.h @@ -41,6 +41,7 @@ #define QT3DCORE_QPROPERTYVALUEADDEDCHANGEBASE_H #include <Qt3DCore/qscenechange.h> +#include <Qt3DCore/qt3dcore_global.h> #include <QtCore/qsharedpointer.h> QT_BEGIN_NAMESPACE @@ -49,8 +50,11 @@ namespace Qt3DCore { class QPropertyValueAddedChangeBasePrivate; -class QPropertyValueAddedChangeBase : public QSceneChange +class QT3DCORESHARED_EXPORT QPropertyValueAddedChangeBase : public QSceneChange { +public: + ~QPropertyValueAddedChangeBase(); + protected: explicit QPropertyValueAddedChangeBase(QNodeId subjectId); QPropertyValueAddedChangeBase(QPropertyValueAddedChangeBasePrivate &dd, QNodeId subjectId); diff --git a/src/core/changes/qpropertyvalueaddedchangebase_p.h b/src/core/changes/qpropertyvalueaddedchangebase_p.h index 9ff362a04..405b2ad3f 100644 --- a/src/core/changes/qpropertyvalueaddedchangebase_p.h +++ b/src/core/changes/qpropertyvalueaddedchangebase_p.h @@ -52,6 +52,7 @@ // #include <private/qscenechange_p.h> +#include <Qt3DCore/private/qt3dcore_global_p.h> QT_BEGIN_NAMESPACE @@ -59,7 +60,7 @@ namespace Qt3DCore { class QPropertyValueAddedChangeBase; -class QPropertyValueAddedChangeBasePrivate : public QSceneChangePrivate +class QT3DCORE_PRIVATE_EXPORT QPropertyValueAddedChangeBasePrivate : public QSceneChangePrivate { public: QPropertyValueAddedChangeBasePrivate(); diff --git a/src/core/changes/qpropertyvalueremovedchangebase.cpp b/src/core/changes/qpropertyvalueremovedchangebase.cpp index 91a5f4315..5644f28f0 100644 --- a/src/core/changes/qpropertyvalueremovedchangebase.cpp +++ b/src/core/changes/qpropertyvalueremovedchangebase.cpp @@ -88,6 +88,10 @@ QPropertyValueRemovedChangeBase::QPropertyValueRemovedChangeBase(QPropertyValueR { } +QPropertyValueRemovedChangeBase::~QPropertyValueRemovedChangeBase() +{ +} + } // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/changes/qpropertyvalueremovedchangebase.h b/src/core/changes/qpropertyvalueremovedchangebase.h index 07f424ff0..591cd8b77 100644 --- a/src/core/changes/qpropertyvalueremovedchangebase.h +++ b/src/core/changes/qpropertyvalueremovedchangebase.h @@ -41,6 +41,7 @@ #define QT3DCORE_QPROPERTYVALUEREMOVEDCHANGEBASE_H #include <Qt3DCore/qscenechange.h> +#include <Qt3DCore/qt3dcore_global.h> #include <QtCore/qsharedpointer.h> QT_BEGIN_NAMESPACE @@ -49,8 +50,11 @@ namespace Qt3DCore { class QPropertyValueRemovedChangeBasePrivate; -class QPropertyValueRemovedChangeBase : public QSceneChange +class QT3DCORESHARED_EXPORT QPropertyValueRemovedChangeBase : public QSceneChange { +public: + ~QPropertyValueRemovedChangeBase(); + protected: Q_DECLARE_PRIVATE(QPropertyValueRemovedChangeBase) explicit QPropertyValueRemovedChangeBase(QNodeId subjectId); diff --git a/src/core/changes/qpropertyvalueremovedchangebase_p.h b/src/core/changes/qpropertyvalueremovedchangebase_p.h index 9313196cd..e4c4be640 100644 --- a/src/core/changes/qpropertyvalueremovedchangebase_p.h +++ b/src/core/changes/qpropertyvalueremovedchangebase_p.h @@ -52,6 +52,7 @@ // #include <private/qscenechange_p.h> +#include <Qt3DCore/private/qt3dcore_global_p.h> QT_BEGIN_NAMESPACE @@ -59,7 +60,7 @@ namespace Qt3DCore { class QPropertyValueRemovedChangeBase; -class QPropertyValueRemovedChangeBasePrivate : public QSceneChangePrivate +class QT3DCORE_PRIVATE_EXPORT QPropertyValueRemovedChangeBasePrivate : public QSceneChangePrivate { public: QPropertyValueRemovedChangeBasePrivate(); |