diff options
Diffstat (limited to 'src/core/changes/qscenechange.h')
| -rw-r--r-- | src/core/changes/qscenechange.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/core/changes/qscenechange.h b/src/core/changes/qscenechange.h index e8c0ea748..3fc896aca 100644 --- a/src/core/changes/qscenechange.h +++ b/src/core/changes/qscenechange.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -enum ChangeFlag { +enum Q3D_DECL_DEPRECATED ChangeFlag { NodeCreated = 1 << 0, NodeDeleted = 1 << 1, PropertyUpdated = 1 << 2, @@ -60,18 +60,14 @@ enum ChangeFlag { CallbackTriggered = 1 << 8, AllChanges = 0xFFFFFFFF }; + +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED Q_DECLARE_FLAGS(ChangeFlags, ChangeFlag) Q_DECLARE_OPERATORS_FOR_FLAGS(ChangeFlags) +QT_WARNING_POP class QNode; -//! internal -struct NodeRelationshipChange { - QNode *node; - QNode *subNode; - ChangeFlag change; - const char *property; -}; - class QSceneChangePrivate; class Q_3DCORESHARED_EXPORT QSceneChange @@ -86,7 +82,10 @@ public: virtual ~QSceneChange(); + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED ChangeFlag type() const Q_DECL_NOTHROW; + QT_WARNING_POP void setDeliveryFlags(DeliveryFlags flags) Q_DECL_NOTHROW; DeliveryFlags deliveryFlags() const Q_DECL_NOTHROW; @@ -95,9 +94,12 @@ public: protected: Q_DECLARE_PRIVATE(QSceneChange) - explicit QSceneChange(ChangeFlag type, QNodeId subjectId); - explicit QSceneChange(QSceneChangePrivate &dd, - ChangeFlag type, QNodeId subjectId); + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED + Q3D_DECL_DEPRECATED explicit QSceneChange(ChangeFlag type, QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QSceneChange(QSceneChangePrivate &dd, + ChangeFlag type, QNodeId subjectId); + QT_WARNING_POP QSceneChangePrivate *d_ptr; private: |