From 6e448dd5918c70ddfd0d52f62522fa49c02e8ba8 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Mon, 2 Dec 2019 17:19:03 +0000 Subject: 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 --- src/core/changes/qcomponentaddedchange.h | 10 +++++----- src/core/changes/qcomponentremovedchange.h | 10 +++++----- src/core/changes/qdynamicpropertyupdatedchange.h | 4 ++-- src/core/changes/qnodecommand.h | 4 ++-- src/core/changes/qnodecreatedchange.h | 6 +++--- src/core/changes/qnodedestroyedchange.h | 4 ++-- src/core/changes/qpropertynodeaddedchange.h | 4 ++-- src/core/changes/qpropertynoderemovedchange.h | 4 ++-- src/core/changes/qpropertyupdatedchange.h | 4 ++-- src/core/changes/qpropertyupdatedchangebase.h | 4 ++-- src/core/changes/qpropertyvalueaddedchange.h | 4 ++-- src/core/changes/qpropertyvalueaddedchangebase.h | 6 +++--- src/core/changes/qpropertyvalueremovedchange.h | 4 ++-- src/core/changes/qpropertyvalueremovedchangebase.h | 6 +++--- src/core/changes/qscenechange.cpp | 1 + src/core/changes/qscenechange.h | 10 +++++----- src/core/changes/qskeletoncreatedchange_p.h | 6 +++--- src/core/changes/qstaticpropertyupdatedchangebase.h | 6 +++--- .../changes/qstaticpropertyvalueaddedchangebase.h | 2 +- .../changes/qstaticpropertyvalueremovedchangebase.h | 2 +- src/core/nodes/qbackendnode.cpp | 12 +++++++++--- src/core/nodes/qbackendnode.h | 12 ++++++------ src/core/nodes/qnode.cpp | 19 +++++++++++++------ src/core/nodes/qnode.h | 12 ++++++------ src/core/qpostman_p.h | 2 +- src/render/backend/rendersettings.cpp | 1 - src/render/framegraph/qbuffercapture.cpp | 4 ++-- src/render/framegraph/qrendercapture.cpp | 4 ++-- src/render/frontend/qrendersettings.cpp | 8 ++++---- tests/auto/core/qaspectengine/tst_qaspectengine.cpp | 2 +- tests/auto/render/entity/tst_entity.cpp | 6 ------ 31 files changed, 95 insertions(+), 88 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 QComponentAddedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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 QComponentRemovedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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 QDynamicPropertyUpdatedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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 QNodeCommandPtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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 QNodeCreatedChangeBasePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer QNodeCreatedChangeBasePtr; template class QNodeCreatedChange : public QNodeCreatedChangeBase @@ -81,7 +81,7 @@ public: }; template -using QNodeCreatedChangePtr = QSharedPointer>; +Q3D_DECL_DEPRECATED using QNodeCreatedChangePtr = QSharedPointer>; } // 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 &subtreeIdsAndTypes); + Q3D_DECL_DEPRECATED explicit QNodeDestroyedChange(const QNode *node, const QVector &subtreeIdsAndTypes); ~QNodeDestroyedChange(); QVector subtreeIdsAndTypes() const; @@ -59,7 +59,7 @@ private: Q_DECLARE_PRIVATE(QNodeDestroyedChange) }; -typedef QSharedPointer QNodeDestroyedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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 QPropertyNodeAddedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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 QPropertyNodeRemovedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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 QPropertyUpdatedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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 QPropertyUpdatedChangeBasePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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 QPropertyValueAddedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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 QPropertyValueAddedChangeBasePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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 QPropertyValueRemovedChangePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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 QPropertyValueRemovedChangeBasePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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 QSceneChangePtr; +Q3D_DECL_DEPRECATED typedef Q3D_DECL_DEPRECATED QSharedPointer 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 QSkeletonCreatedChangeBasePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer QSkeletonCreatedChangeBasePtr; template class QSkeletonCreatedChange : public QSkeletonCreatedChangeBase @@ -90,7 +90,7 @@ public: }; template -using QSkeletonCreatedChangePtr = QSharedPointer>; +Q3D_DECL_DEPRECATED using QSkeletonCreatedChangePtr = QSharedPointer>; } // 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 QStaticPropertyUpdatedChangeBasePtr; +Q3D_DECL_DEPRECATED typedef QSharedPointer 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); }; diff --git a/src/core/nodes/qbackendnode.cpp b/src/core/nodes/qbackendnode.cpp index e5f93e96f..4138ea060 100644 --- a/src/core/nodes/qbackendnode.cpp +++ b/src/core/nodes/qbackendnode.cpp @@ -220,6 +220,7 @@ QBackendNode::QBackendNode(QBackendNodePrivate &dd) /*! * Notifies observers of scene change \a e. + * \obsolete */ void QBackendNode::notifyObservers(const QSceneChangePtr &e) { @@ -228,6 +229,8 @@ void QBackendNode::notifyObservers(const QSceneChangePtr &e) } /*! + \obsolete + Send the command named \a name with contents \a data, and specify \a replyTo as the command id to which the reply needs to be sent. @@ -247,6 +250,7 @@ QNodeCommand::CommandId QBackendNode::sendCommand(const QString &name, /*! Send the reply to \a command. + \obsolete */ void QBackendNode::sendReply(const QNodeCommandPtr &command) { @@ -254,9 +258,12 @@ void QBackendNode::sendReply(const QNodeCommandPtr &command) notifyObservers(command); } +/*! + * \obsolete + */ void QBackendNode::initializeFromPeer(const QNodeCreatedChangeBasePtr &change) { - Q_UNUSED(change); + Q_UNUSED(change) qCDebug(Nodes) << Q_FUNC_INFO << change->metaObject()->className() << "does not override"; } @@ -270,8 +277,7 @@ void QBackendNode::setEnabled(bool enabled) Q_DECL_NOTHROW } /*! - * TODO - * \a e + * \obsolete */ void QBackendNode::sceneChangeEvent(const QSceneChangePtr &e) { diff --git a/src/core/nodes/qbackendnode.h b/src/core/nodes/qbackendnode.h index 550ced04f..691375999 100644 --- a/src/core/nodes/qbackendnode.h +++ b/src/core/nodes/qbackendnode.h @@ -90,18 +90,18 @@ public: protected: Q_DECLARE_PRIVATE(QBackendNode) explicit QBackendNode(QBackendNodePrivate &dd); - void notifyObservers(const QSceneChangePtr &e); - QNodeCommand::CommandId sendCommand(const QString &name, const QVariant &data, - QNodeCommand::CommandId replyTo = QNodeCommand::CommandId()); - void sendReply(const QNodeCommandPtr &command); - virtual void sceneChangeEvent(const QSceneChangePtr &e); + Q3D_DECL_DEPRECATED void notifyObservers(const QSceneChangePtr &e); + Q3D_DECL_DEPRECATED QNodeCommand::CommandId sendCommand(const QString &name, const QVariant &data, + QNodeCommand::CommandId replyTo = QNodeCommand::CommandId()); + Q3D_DECL_DEPRECATED void sendReply(const QNodeCommandPtr &command); + Q3D_DECL_DEPRECATED virtual void sceneChangeEvent(const QSceneChangePtr &e); QBackendNodePrivate *d_ptr; private: Q_DISABLE_COPY(QBackendNode) void setPeerId(QNodeId id) Q_DECL_NOEXCEPT; - virtual void initializeFromPeer(const QNodeCreatedChangeBasePtr &change); + Q3D_DECL_DEPRECATED virtual void initializeFromPeer(const QNodeCreatedChangeBasePtr &change); friend class QBackendNodePropertyChange; friend class QAbstractAspectPrivate; diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp index af16eaa21..ad084242f 100644 --- a/src/core/nodes/qnode.cpp +++ b/src/core/nodes/qnode.cpp @@ -382,7 +382,7 @@ void QNodePrivate::unregisterNotifiedProperties() void QNodePrivate::propertyChanged(int propertyIndex) { - Q_UNUSED(propertyIndex); + Q_UNUSED(propertyIndex) // Bail out early if we can to avoid the cost below if (m_blockNotifications) @@ -539,6 +539,8 @@ void QNode::notifyObservers(const QSceneChangePtr &change) } /*! + \obsolete + Called when one or more backend aspects sends a notification \a change to the current Qt3DCore::QNode instance. @@ -547,7 +549,7 @@ void QNode::notifyObservers(const QSceneChangePtr &change) */ void QNode::sceneChangeEvent(const QSceneChangePtr &change) { - Q_UNUSED(change); + Q_UNUSED(change) if (change->type() == Qt3DCore::PropertyUpdated) { // TODO: Do this more efficiently. We could pass the metaobject and property // index to the animation aspect via the QChannelMapping. This would @@ -594,8 +596,8 @@ QScene *QNodePrivate::scene() const */ void QNodePrivate::notifyPropertyChange(const char *name, const QVariant &value) { - Q_UNUSED(name); - Q_UNUSED(value); + Q_UNUSED(name) + Q_UNUSED(value) // Bail out early if we can to avoid operator new if (m_blockNotifications) @@ -606,8 +608,8 @@ void QNodePrivate::notifyPropertyChange(const char *name, const QVariant &value) void QNodePrivate::notifyDynamicPropertyChange(const QByteArray &name, const QVariant &value) { - Q_UNUSED(name); - Q_UNUSED(value); + Q_UNUSED(name) + Q_UNUSED(value) // Bail out early if we can to avoid operator new if (m_blockNotifications) @@ -997,6 +999,9 @@ void QNode::clearPropertyTrackings() d->updatePropertyTrackMode(); } +/*! + * \obsolete + */ QNodeCreatedChangeBasePtr QNode::createNodeCreationChange() const { // Uncomment this when implementing new frontend and backend types. @@ -1049,6 +1054,7 @@ QNodeCreatedChangeBasePtr QNode::createNodeCreationChange() const */ /*! * \brief Sends a command message to the backend node + * \obsolete * * Creates a QNodeCommand message and dispatches it to the backend node. The * command is given and a \a name and some \a data which can be used in the @@ -1079,6 +1085,7 @@ QNodeCommand::CommandId QNode::sendCommand(const QString &name, /*! * \brief Send a \a command back to the backend node. + * \obsolete * * Assumes the command is to be to sent back in reply to itself to the backend node. * diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h index 9ca817fb6..efdec8da5 100644 --- a/src/core/nodes/qnode.h +++ b/src/core/nodes/qnode.h @@ -99,9 +99,9 @@ public: void clearPropertyTracking(const QString &propertyName); void clearPropertyTrackings(); - QNodeCommand::CommandId sendCommand(const QString &name, const QVariant &data = QVariant(), - QNodeCommand::CommandId replyTo = QNodeCommand::CommandId()); - void sendReply(const QNodeCommandPtr &command); + Q3D_DECL_DEPRECATED QNodeCommand::CommandId sendCommand(const QString &name, const QVariant &data = QVariant(), + QNodeCommand::CommandId replyTo = QNodeCommand::CommandId()); + Q3D_DECL_DEPRECATED void sendReply(const QNodeCommandPtr &command); public Q_SLOTS: void setParent(QNode *parent); @@ -116,12 +116,12 @@ Q_SIGNALS: protected: explicit QNode(QNodePrivate &dd, QNode *parent = nullptr); - void notifyObservers(const QSceneChangePtr &change); - virtual void sceneChangeEvent(const QSceneChangePtr &change); + Q3D_DECL_DEPRECATED void notifyObservers(const QSceneChangePtr &change); + Q3D_DECL_DEPRECATED virtual void sceneChangeEvent(const QSceneChangePtr &change); private: Q_DECLARE_PRIVATE(QNode) - virtual QNodeCreatedChangeBasePtr createNodeCreationChange() const; + Q3D_DECL_DEPRECATED virtual QNodeCreatedChangeBasePtr createNodeCreationChange() const; // We only want setParent(QNode *) to be callable // when dealing with QNode objects diff --git a/src/core/qpostman_p.h b/src/core/qpostman_p.h index 23c638239..3e5f91742 100644 --- a/src/core/qpostman_p.h +++ b/src/core/qpostman_p.h @@ -75,7 +75,7 @@ class Q_AUTOTEST_EXPORT QPostman final { Q_OBJECT public: - explicit QPostman(QObject *parent = 0); + explicit QPostman(QObject *parent = nullptr); ~QPostman(); void setScene(QScene *sceneLookup) final; diff --git a/src/render/backend/rendersettings.cpp b/src/render/backend/rendersettings.cpp index 8638352c4..5aeaa2563 100644 --- a/src/render/backend/rendersettings.cpp +++ b/src/render/backend/rendersettings.cpp @@ -42,7 +42,6 @@ #include #include #include -#include QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qbuffercapture.cpp b/src/render/framegraph/qbuffercapture.cpp index c71c0adb7..3eaa5dfd2 100644 --- a/src/render/framegraph/qbuffercapture.cpp +++ b/src/render/framegraph/qbuffercapture.cpp @@ -39,8 +39,8 @@ #include #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qrendercapture.cpp b/src/render/framegraph/qrendercapture.cpp index 2169f72dd..3c6f90c7c 100644 --- a/src/render/framegraph/qrendercapture.cpp +++ b/src/render/framegraph/qrendercapture.cpp @@ -36,8 +36,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/render/frontend/qrendersettings.cpp b/src/render/frontend/qrendersettings.cpp index 5916c4b73..491d3e442 100644 --- a/src/render/frontend/qrendersettings.cpp +++ b/src/render/frontend/qrendersettings.cpp @@ -104,25 +104,25 @@ void QRenderSettingsPrivate::invalidateFrame() /*! \internal */ void QRenderSettingsPrivate::_q_onPickingMethodChanged(QPickingSettings::PickMethod pickMethod) { - notifyPropertyChange("pickMethod", pickMethod);// TODOSYNC + notifyPropertyChange("pickMethod", pickMethod); } /*! \internal */ void QRenderSettingsPrivate::_q_onPickResultModeChanged(QPickingSettings::PickResultMode pickResultMode) { - notifyPropertyChange("pickResultMode", pickResultMode);// TODOSYNC + notifyPropertyChange("pickResultMode", pickResultMode); } /*! \internal */ void QRenderSettingsPrivate::_q_onFaceOrientationPickingModeChanged(QPickingSettings::FaceOrientationPickingMode faceOrientationPickingMode) { - notifyPropertyChange("faceOrientationPickingMode", faceOrientationPickingMode);// TODOSYNC + notifyPropertyChange("faceOrientationPickingMode", faceOrientationPickingMode); } /*! \internal */ void QRenderSettingsPrivate::_q_onWorldSpaceToleranceChanged(float worldSpaceTolerance) { - notifyPropertyChange("pickWorldSpaceTolerance", worldSpaceTolerance);// TODOSYNC + notifyPropertyChange("pickWorldSpaceTolerance", worldSpaceTolerance); } QRenderSettings::QRenderSettings(Qt3DCore::QNode *parent) diff --git a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp index 244077d46..4565f0d69 100644 --- a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp +++ b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp @@ -179,7 +179,7 @@ private Q_SLOTS: // WHEN // we set an empty/null scene root... engine.setRootEntity(QEntityPtr()); - QTimer::singleShot(1000, &eventLoop, SLOT(quit())); + QTimer::singleShot(600, &eventLoop, SLOT(quit())); // ...and allow events to process... eventLoop.exec(); diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp index e3b8e756e..93f2614b8 100644 --- a/tests/auto/render/entity/tst_entity.cpp +++ b/tests/auto/render/entity/tst_entity.cpp @@ -35,7 +35,6 @@ #include #include -#include #include #include @@ -151,11 +150,6 @@ private slots: nodeManagers.renderNodesManager()->getOrCreateResource(dummyFrontendEntity.id()); nodeManagers.renderNodesManager()->getOrCreateResource(dummyFrontendEntityChild.id()); -// TODOSYNC clean up -// // Send children added event to entity -// const auto addEntityChange = QPropertyNodeAddedChangePtr::create(dummyFrontendEntity.id(), &dummyFrontendEntityChild); -// entity.sceneChangeEvent(addEntityChange); - // THEN QVERIFY(!entity.componentUuid().isNull()); QVERIFY(!entity.componentUuid().isNull()); -- cgit v1.2.3