diff options
author | Mike Krus <mike.krus@kdab.com> | 2019-12-02 17:19:03 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2019-12-09 13:40:08 +0000 |
commit | 6e448dd5918c70ddfd0d52f62522fa49c02e8ba8 (patch) | |
tree | ff938f659a74c3f3609ba556f78411cb64bcc1dc /src/core/changes | |
parent | 4505f5acbc346a0cea6ccf5e7d02c75c6e3ca4cb (diff) |
Deprecate message API
Deprecates the message classes and the public APIs to send/receive them.
(deprecates the constructors as deprecating classes breaks syncqt)
Change-Id: I4908f15c3c5f1d63969a0f2e11f6ecb22e2e3748
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/core/changes')
20 files changed, 51 insertions, 50 deletions
diff --git a/src/core/changes/qcomponentaddedchange.h b/src/core/changes/qcomponentaddedchange.h index ef2f6a227..9e1522024 100644 --- a/src/core/changes/qcomponentaddedchange.h +++ b/src/core/changes/qcomponentaddedchange.h @@ -53,10 +53,10 @@ class QComponentAddedChangePrivate; class Q_3DCORESHARED_EXPORT QComponentAddedChange : public QSceneChange { public: - explicit QComponentAddedChange(const QEntity *entity, - const QComponent *component); - explicit QComponentAddedChange(const QComponent *component, - const QEntity *entity); + Q3D_DECL_DEPRECATED explicit QComponentAddedChange(const QEntity *entity, + const QComponent *component); + Q3D_DECL_DEPRECATED explicit QComponentAddedChange(const QComponent *component, + const QEntity *entity); ~QComponentAddedChange(); QNodeId entityId() const Q_DECL_NOTHROW; @@ -67,7 +67,7 @@ private: Q_DECLARE_PRIVATE(QComponentAddedChange) }; -typedef QSharedPointer<QComponentAddedChange> QComponentAddedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QComponentAddedChange> QComponentAddedChangePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qcomponentremovedchange.h b/src/core/changes/qcomponentremovedchange.h index 8108b33d5..e0b039780 100644 --- a/src/core/changes/qcomponentremovedchange.h +++ b/src/core/changes/qcomponentremovedchange.h @@ -53,10 +53,10 @@ class QComponentRemovedChangePrivate; class Q_3DCORESHARED_EXPORT QComponentRemovedChange : public QSceneChange { public: - explicit QComponentRemovedChange(const QEntity *entity, - const QComponent *component); - explicit QComponentRemovedChange(const QComponent *component, - const QEntity *entity); + Q3D_DECL_DEPRECATED explicit QComponentRemovedChange(const QEntity *entity, + const QComponent *component); + Q3D_DECL_DEPRECATED explicit QComponentRemovedChange(const QComponent *component, + const QEntity *entity); ~QComponentRemovedChange(); QNodeId entityId() const Q_DECL_NOTHROW; @@ -67,7 +67,7 @@ private: Q_DECLARE_PRIVATE(QComponentRemovedChange) }; -typedef QSharedPointer<QComponentRemovedChange> QComponentRemovedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QComponentRemovedChange> QComponentRemovedChangePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qdynamicpropertyupdatedchange.h b/src/core/changes/qdynamicpropertyupdatedchange.h index 0509582b0..7009e1fe7 100644 --- a/src/core/changes/qdynamicpropertyupdatedchange.h +++ b/src/core/changes/qdynamicpropertyupdatedchange.h @@ -51,7 +51,7 @@ class QDynamicPropertyUpdatedChangePrivate; class Q_3DCORESHARED_EXPORT QDynamicPropertyUpdatedChange : public QPropertyUpdatedChangeBase { public: - explicit QDynamicPropertyUpdatedChange(QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QDynamicPropertyUpdatedChange(QNodeId subjectId); ~QDynamicPropertyUpdatedChange(); QByteArray propertyName() const; @@ -65,7 +65,7 @@ protected: QDynamicPropertyUpdatedChange(QDynamicPropertyUpdatedChangePrivate &dd, QNodeId subjectId); }; -typedef QSharedPointer<QDynamicPropertyUpdatedChange> QDynamicPropertyUpdatedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QDynamicPropertyUpdatedChange> QDynamicPropertyUpdatedChangePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qnodecommand.h b/src/core/changes/qnodecommand.h index 3622f7421..83d7caf4f 100644 --- a/src/core/changes/qnodecommand.h +++ b/src/core/changes/qnodecommand.h @@ -57,7 +57,7 @@ public: typedef quint32 CommandId; #endif - explicit QNodeCommand(QNodeId id); + Q3D_DECL_DEPRECATED explicit QNodeCommand(QNodeId id); ~QNodeCommand(); CommandId commandId() const; @@ -76,7 +76,7 @@ private: Q_DECLARE_PRIVATE(QNodeCommand) }; -typedef QSharedPointer<QNodeCommand> QNodeCommandPtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QNodeCommand> QNodeCommandPtr; } // namespace Qt3DCore diff --git a/src/core/changes/qnodecreatedchange.h b/src/core/changes/qnodecreatedchange.h index f46e8abee..36525f376 100644 --- a/src/core/changes/qnodecreatedchange.h +++ b/src/core/changes/qnodecreatedchange.h @@ -51,7 +51,7 @@ class QNodeCreatedChangeBasePrivate; class Q_3DCORESHARED_EXPORT QNodeCreatedChangeBase : public QSceneChange { public: - explicit QNodeCreatedChangeBase(const QNode *node); + Q3D_DECL_DEPRECATED explicit QNodeCreatedChangeBase(const QNode *node); ~QNodeCreatedChangeBase(); QNodeId parentId() const Q_DECL_NOTHROW; @@ -65,7 +65,7 @@ private: Q_DECLARE_PRIVATE(QNodeCreatedChangeBase) }; -typedef QSharedPointer<QNodeCreatedChangeBase> QNodeCreatedChangeBasePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QNodeCreatedChangeBase> QNodeCreatedChangeBasePtr; template<typename T> class QNodeCreatedChange : public QNodeCreatedChangeBase @@ -81,7 +81,7 @@ public: }; template<typename T> -using QNodeCreatedChangePtr = QSharedPointer<QNodeCreatedChange<T>>; +Q3D_DECL_DEPRECATED using QNodeCreatedChangePtr = QSharedPointer<QNodeCreatedChange<T>>; } // namespace Qt3DCore diff --git a/src/core/changes/qnodedestroyedchange.h b/src/core/changes/qnodedestroyedchange.h index c072dd412..dce6da59e 100644 --- a/src/core/changes/qnodedestroyedchange.h +++ b/src/core/changes/qnodedestroyedchange.h @@ -50,7 +50,7 @@ class QNodeDestroyedChangePrivate; class Q_3DCORESHARED_EXPORT QNodeDestroyedChange : public QSceneChange { public: - explicit QNodeDestroyedChange(const QNode *node, const QVector<QNodeIdTypePair> &subtreeIdsAndTypes); + Q3D_DECL_DEPRECATED explicit QNodeDestroyedChange(const QNode *node, const QVector<QNodeIdTypePair> &subtreeIdsAndTypes); ~QNodeDestroyedChange(); QVector<QNodeIdTypePair> subtreeIdsAndTypes() const; @@ -59,7 +59,7 @@ private: Q_DECLARE_PRIVATE(QNodeDestroyedChange) }; -typedef QSharedPointer<QNodeDestroyedChange> QNodeDestroyedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QNodeDestroyedChange> QNodeDestroyedChangePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qpropertynodeaddedchange.h b/src/core/changes/qpropertynodeaddedchange.h index ce3288a65..062244f88 100644 --- a/src/core/changes/qpropertynodeaddedchange.h +++ b/src/core/changes/qpropertynodeaddedchange.h @@ -53,7 +53,7 @@ class QPropertyNodeAddedChangePrivate; class Q_3DCORESHARED_EXPORT QPropertyNodeAddedChange : public QStaticPropertyValueAddedChangeBase { public: - explicit QPropertyNodeAddedChange(QNodeId subjectId, QNode *node); + Q3D_DECL_DEPRECATED explicit QPropertyNodeAddedChange(QNodeId subjectId, QNode *node); ~QPropertyNodeAddedChange(); QNodeId addedNodeId() const; @@ -63,7 +63,7 @@ private: Q_DECLARE_PRIVATE(QPropertyNodeAddedChange) }; -typedef QSharedPointer<QPropertyNodeAddedChange> QPropertyNodeAddedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QPropertyNodeAddedChange> QPropertyNodeAddedChangePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qpropertynoderemovedchange.h b/src/core/changes/qpropertynoderemovedchange.h index 1a4db8f1c..a8ea9d6c4 100644 --- a/src/core/changes/qpropertynoderemovedchange.h +++ b/src/core/changes/qpropertynoderemovedchange.h @@ -53,7 +53,7 @@ class QPropertyNodeRemovedChangePrivate; class Q_3DCORESHARED_EXPORT QPropertyNodeRemovedChange : public QStaticPropertyValueRemovedChangeBase { public: - explicit QPropertyNodeRemovedChange(QNodeId subjectId, QNode *node); + Q3D_DECL_DEPRECATED explicit QPropertyNodeRemovedChange(QNodeId subjectId, QNode *node); ~QPropertyNodeRemovedChange(); QNodeId removedNodeId() const; @@ -63,7 +63,7 @@ private: Q_DECLARE_PRIVATE(QPropertyNodeRemovedChange) }; -typedef QSharedPointer<QPropertyNodeRemovedChange> QPropertyNodeRemovedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QPropertyNodeRemovedChange> QPropertyNodeRemovedChangePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qpropertyupdatedchange.h b/src/core/changes/qpropertyupdatedchange.h index e0c12f13d..aa0dd9364 100644 --- a/src/core/changes/qpropertyupdatedchange.h +++ b/src/core/changes/qpropertyupdatedchange.h @@ -51,7 +51,7 @@ class QPropertyUpdatedChangePrivate; class Q_3DCORESHARED_EXPORT QPropertyUpdatedChange : public QStaticPropertyUpdatedChangeBase { public: - explicit QPropertyUpdatedChange(QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QPropertyUpdatedChange(QNodeId subjectId); virtual ~QPropertyUpdatedChange(); QVariant value() const; @@ -62,7 +62,7 @@ protected: QPropertyUpdatedChange(QPropertyUpdatedChangePrivate &dd, QNodeId subjectId); }; -typedef QSharedPointer<QPropertyUpdatedChange> QPropertyUpdatedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QPropertyUpdatedChange> QPropertyUpdatedChangePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qpropertyupdatedchangebase.h b/src/core/changes/qpropertyupdatedchangebase.h index 800abb477..5a0f6c87f 100644 --- a/src/core/changes/qpropertyupdatedchangebase.h +++ b/src/core/changes/qpropertyupdatedchangebase.h @@ -56,12 +56,12 @@ public: ~QPropertyUpdatedChangeBase(); protected: - explicit QPropertyUpdatedChangeBase(QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QPropertyUpdatedChangeBase(QNodeId subjectId); QPropertyUpdatedChangeBase(QPropertyUpdatedChangeBasePrivate &dd, QNodeId subjectId); Q_DECLARE_PRIVATE(QPropertyUpdatedChangeBase) }; -typedef QSharedPointer<QPropertyUpdatedChangeBase> QPropertyUpdatedChangeBasePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QPropertyUpdatedChangeBase> QPropertyUpdatedChangeBasePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qpropertyvalueaddedchange.h b/src/core/changes/qpropertyvalueaddedchange.h index d85720246..e70d78b7e 100644 --- a/src/core/changes/qpropertyvalueaddedchange.h +++ b/src/core/changes/qpropertyvalueaddedchange.h @@ -53,7 +53,7 @@ class QPropertyValueAddedChangePrivate; class Q_3DCORESHARED_EXPORT QPropertyValueAddedChange : public QStaticPropertyValueAddedChangeBase { public: - explicit QPropertyValueAddedChange(QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QPropertyValueAddedChange(QNodeId subjectId); ~QPropertyValueAddedChange(); void setAddedValue(const QVariant &value); @@ -63,7 +63,7 @@ private: Q_DECLARE_PRIVATE(QPropertyValueAddedChange) }; -typedef QSharedPointer<QPropertyValueAddedChange> QPropertyValueAddedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QPropertyValueAddedChange> QPropertyValueAddedChangePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qpropertyvalueaddedchangebase.h b/src/core/changes/qpropertyvalueaddedchangebase.h index 2be39ad47..148411de8 100644 --- a/src/core/changes/qpropertyvalueaddedchangebase.h +++ b/src/core/changes/qpropertyvalueaddedchangebase.h @@ -56,12 +56,12 @@ public: ~QPropertyValueAddedChangeBase(); protected: - explicit QPropertyValueAddedChangeBase(QNodeId subjectId); - explicit QPropertyValueAddedChangeBase(QPropertyValueAddedChangeBasePrivate &dd, QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QPropertyValueAddedChangeBase(QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QPropertyValueAddedChangeBase(QPropertyValueAddedChangeBasePrivate &dd, QNodeId subjectId); Q_DECLARE_PRIVATE(QPropertyValueAddedChangeBase) }; -typedef QSharedPointer<QPropertyValueAddedChangeBase> QPropertyValueAddedChangeBasePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QPropertyValueAddedChangeBase> QPropertyValueAddedChangeBasePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qpropertyvalueremovedchange.h b/src/core/changes/qpropertyvalueremovedchange.h index 2bd781ed5..70eb42db4 100644 --- a/src/core/changes/qpropertyvalueremovedchange.h +++ b/src/core/changes/qpropertyvalueremovedchange.h @@ -53,7 +53,7 @@ class QPropertyValueRemovedChangePrivate; class Q_3DCORESHARED_EXPORT QPropertyValueRemovedChange : public QStaticPropertyValueRemovedChangeBase { public: - explicit QPropertyValueRemovedChange(QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QPropertyValueRemovedChange(QNodeId subjectId); ~QPropertyValueRemovedChange(); void setRemovedValue(const QVariant &value); @@ -63,7 +63,7 @@ private: Q_DECLARE_PRIVATE(QPropertyValueRemovedChange) }; -typedef QSharedPointer<QPropertyValueRemovedChange> QPropertyValueRemovedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QPropertyValueRemovedChange> QPropertyValueRemovedChangePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qpropertyvalueremovedchangebase.h b/src/core/changes/qpropertyvalueremovedchangebase.h index 233354078..b5ead7d22 100644 --- a/src/core/changes/qpropertyvalueremovedchangebase.h +++ b/src/core/changes/qpropertyvalueremovedchangebase.h @@ -57,11 +57,11 @@ public: protected: Q_DECLARE_PRIVATE(QPropertyValueRemovedChangeBase) - explicit QPropertyValueRemovedChangeBase(QNodeId subjectId); - explicit QPropertyValueRemovedChangeBase(QPropertyValueRemovedChangeBasePrivate &dd, QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QPropertyValueRemovedChangeBase(QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QPropertyValueRemovedChangeBase(QPropertyValueRemovedChangeBasePrivate &dd, QNodeId subjectId); }; -typedef QSharedPointer<QPropertyValueRemovedChangeBase> QPropertyValueRemovedChangeBasePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QPropertyValueRemovedChangeBase> QPropertyValueRemovedChangeBasePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qscenechange.cpp b/src/core/changes/qscenechange.cpp index 87bf06ea0..822451b5f 100644 --- a/src/core/changes/qscenechange.cpp +++ b/src/core/changes/qscenechange.cpp @@ -48,6 +48,7 @@ namespace Qt3DCore { /*! * \enum Qt3DCore::ChangeFlag * \relates Qt3DCore::QSceneChange + * \obsolete * * The types of change that can be sent and received by Qt3D's change notification system. * diff --git a/src/core/changes/qscenechange.h b/src/core/changes/qscenechange.h index 4a0740819..07703cddc 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, @@ -87,9 +87,9 @@ public: protected: Q_DECLARE_PRIVATE(QSceneChange) - explicit QSceneChange(ChangeFlag type, QNodeId subjectId); - explicit QSceneChange(QSceneChangePrivate &dd, - ChangeFlag type, QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QSceneChange(ChangeFlag type, QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QSceneChange(QSceneChangePrivate &dd, + ChangeFlag type, QNodeId subjectId); QSceneChangePrivate *d_ptr; private: @@ -98,7 +98,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QSceneChange::DeliveryFlags) -typedef QSharedPointer<QSceneChange> QSceneChangePtr; +Q3D_DECL_DEPRECATED typedef Q3D_DECL_DEPRECATED QSharedPointer<QSceneChange> QSceneChangePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qskeletoncreatedchange_p.h b/src/core/changes/qskeletoncreatedchange_p.h index 09b37d545..0cf63fa7f 100644 --- a/src/core/changes/qskeletoncreatedchange_p.h +++ b/src/core/changes/qskeletoncreatedchange_p.h @@ -60,7 +60,7 @@ class QSkeletonCreatedChangeBasePrivate; class Q_3DCORESHARED_EXPORT QSkeletonCreatedChangeBase : public QNodeCreatedChangeBase { public: - explicit QSkeletonCreatedChangeBase(const QAbstractSkeleton *skeleton); + Q3D_DECL_DEPRECATED explicit QSkeletonCreatedChangeBase(const QAbstractSkeleton *skeleton); ~QSkeletonCreatedChangeBase(); enum SkeletonType { @@ -74,7 +74,7 @@ private: Q_DECLARE_PRIVATE(QSkeletonCreatedChangeBase) }; -typedef QSharedPointer<QSkeletonCreatedChangeBase> QSkeletonCreatedChangeBasePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QSkeletonCreatedChangeBase> QSkeletonCreatedChangeBasePtr; template<typename T> class QSkeletonCreatedChange : public QSkeletonCreatedChangeBase @@ -90,7 +90,7 @@ public: }; template<typename T> -using QSkeletonCreatedChangePtr = QSharedPointer<QSkeletonCreatedChange<T>>; +Q3D_DECL_DEPRECATED using QSkeletonCreatedChangePtr = QSharedPointer<QSkeletonCreatedChange<T>>; } // namespace Qt3DCore diff --git a/src/core/changes/qstaticpropertyupdatedchangebase.h b/src/core/changes/qstaticpropertyupdatedchangebase.h index b698d1f06..c59a87a20 100644 --- a/src/core/changes/qstaticpropertyupdatedchangebase.h +++ b/src/core/changes/qstaticpropertyupdatedchangebase.h @@ -57,12 +57,12 @@ public: void setPropertyName(const char *name); protected: - explicit QStaticPropertyUpdatedChangeBase(QNodeId subjectId); - explicit QStaticPropertyUpdatedChangeBase(QStaticPropertyUpdatedChangeBasePrivate &dd, QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QStaticPropertyUpdatedChangeBase(QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QStaticPropertyUpdatedChangeBase(QStaticPropertyUpdatedChangeBasePrivate &dd, QNodeId subjectId); Q_DECLARE_PRIVATE(QStaticPropertyUpdatedChangeBase) }; -typedef QSharedPointer<QStaticPropertyUpdatedChangeBase> QStaticPropertyUpdatedChangeBasePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer<QStaticPropertyUpdatedChangeBase> QStaticPropertyUpdatedChangeBasePtr; } // namespace Qt3DCore diff --git a/src/core/changes/qstaticpropertyvalueaddedchangebase.h b/src/core/changes/qstaticpropertyvalueaddedchangebase.h index e56e8f18a..7e6807764 100644 --- a/src/core/changes/qstaticpropertyvalueaddedchangebase.h +++ b/src/core/changes/qstaticpropertyvalueaddedchangebase.h @@ -59,7 +59,7 @@ public: protected: Q_DECLARE_PRIVATE(QStaticPropertyValueAddedChangeBase) - explicit QStaticPropertyValueAddedChangeBase(QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QStaticPropertyValueAddedChangeBase(QNodeId subjectId); QStaticPropertyValueAddedChangeBase(QStaticPropertyValueAddedChangeBasePrivate &dd, QNodeId subjectId); }; diff --git a/src/core/changes/qstaticpropertyvalueremovedchangebase.h b/src/core/changes/qstaticpropertyvalueremovedchangebase.h index e9f53fb12..d1b96f83e 100644 --- a/src/core/changes/qstaticpropertyvalueremovedchangebase.h +++ b/src/core/changes/qstaticpropertyvalueremovedchangebase.h @@ -59,7 +59,7 @@ public: protected: Q_DECLARE_PRIVATE(QStaticPropertyValueRemovedChangeBase) - explicit QStaticPropertyValueRemovedChangeBase(QNodeId subjectId); + Q3D_DECL_DEPRECATED explicit QStaticPropertyValueRemovedChangeBase(QNodeId subjectId); QStaticPropertyValueRemovedChangeBase(QStaticPropertyValueRemovedChangeBasePrivate &dd, QNodeId subjectId); }; |