Remove deprecated classes and functions

Mostly old messaging API

Change-Id: I17eb2206b2ede56d2f7d36375d5e711d6149019f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

14 files changed, 14 insertions, 122 deletions

diff --git a/src/core/transforms/qabstractskeleton.cpp b/src/core/transforms/qabstractskeleton.cpp
index 4a30d0710..cdda89418 100644
--- a/src/core/transforms/qabstractskeleton.cpp
+++ b/src/core/transforms/qabstractskeleton.cpp
@@ -46,7 +46,7 @@ namespace Qt3DCore {
 
 QAbstractSkeletonPrivate::QAbstractSkeletonPrivate()
     : Qt3DCore::QNodePrivate()
-    , m_type(QSkeletonCreatedChangeBase::Skeleton)
+    , m_type(Skeleton)
     , m_jointCount(0)
 {
 }
@@ -105,13 +105,6 @@ QAbstractSkeleton::~QAbstractSkeleton()
 {
 }
 
-/*! \internal */
-void QAbstractSkeleton::sceneChangeEvent(const QSceneChangePtr &change)
-{
-    // TODO Unused remove in Qt6
-    Q_UNUSED(change)
-}
-
 /*!
     \property Qt3DCore::QAbstractSkeleton::jointCount
 
diff --git a/src/core/transforms/qabstractskeleton.h b/src/core/transforms/qabstractskeleton.h
index 1c2eba08f..7da78011f 100644
--- a/src/core/transforms/qabstractskeleton.h
+++ b/src/core/transforms/qabstractskeleton.h
@@ -64,8 +64,6 @@ Q_SIGNALS:
 
 protected:
     QAbstractSkeleton(QAbstractSkeletonPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    // TODO Unused remove in Qt6
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QAbstractSkeleton)
diff --git a/src/core/transforms/qabstractskeleton_p.h b/src/core/transforms/qabstractskeleton_p.h
index 35d0df755..333fa5fdf 100644
--- a/src/core/transforms/qabstractskeleton_p.h
+++ b/src/core/transforms/qabstractskeleton_p.h
@@ -51,8 +51,8 @@
 // We mean it.
 //
 
+#include <Qt3DCore/qabstractskeleton.h>
 #include <Qt3DCore/private/qnode_p.h>
-#include <Qt3DCore/private/qskeletoncreatedchange_p.h>
 #include <Qt3DCore/private/sqt_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -62,6 +62,11 @@ namespace Qt3DCore {
 class Q_3DCORE_PRIVATE_EXPORT QAbstractSkeletonPrivate : public Qt3DCore::QNodePrivate
 {
 public:
+    enum SkeletonType {
+        Skeleton = 0,
+        SkeletonLoader
+    };
+
     QAbstractSkeletonPrivate();
 
     void setJointCount(int jointCount);
@@ -70,7 +75,7 @@ public:
     static const QAbstractSkeletonPrivate *get(const QAbstractSkeleton *q);
     static QAbstractSkeletonPrivate *get(QAbstractSkeleton *q);
 
-    QSkeletonCreatedChangeBase::SkeletonType m_type;
+    SkeletonType m_type;
 
     int m_jointCount;
     QVector<Sqt> m_localPoses;
diff --git a/src/core/transforms/qarmature.cpp b/src/core/transforms/qarmature.cpp
index d9fef7767..56d310152 100644
--- a/src/core/transforms/qarmature.cpp
+++ b/src/core/transforms/qarmature.cpp
@@ -157,16 +157,6 @@ void QArmature::setSkeleton(Qt3DCore::QAbstractSkeleton *skeleton)
     }
 }
 
-/*! \internal */
-Qt3DCore::QNodeCreatedChangeBasePtr QArmature::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QArmatureData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QArmature);
-    data.skeletonId = qIdForNode(d->m_skeleton);
-    return creationChange;
-}
-
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/transforms/qarmature.h b/src/core/transforms/qarmature.h
index e3beffa01..5e02f99c3 100644
--- a/src/core/transforms/qarmature.h
+++ b/src/core/transforms/qarmature.h
@@ -72,7 +72,6 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QArmature)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DCore
diff --git a/src/core/transforms/qjoint.cpp b/src/core/transforms/qjoint.cpp
index 408d42f6d..de7d913e3 100644
--- a/src/core/transforms/qjoint.cpp
+++ b/src/core/transforms/qjoint.cpp
@@ -40,8 +40,6 @@
 #include "qjoint.h"
 #include "qjoint_p.h"
 
-#include <Qt3DCore/qnodecreatedchange.h>
-
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
@@ -350,7 +348,7 @@ void QJoint::addChildJoint(QJoint *joint)
         d->registerDestructionHelper(joint, &QJoint::removeChildJoint, d->m_childJoints);
 
         if (d->m_changeArbiter != nullptr)
-            d->updateNode(joint, "childJoint", PropertyValueAdded);
+            d->update();
     }
 }
 
@@ -363,7 +361,7 @@ void QJoint::removeChildJoint(QJoint *joint)
     Q_D(QJoint);
     if (d->m_childJoints.contains(joint)) {
         if (d->m_changeArbiter != nullptr)
-            d->updateNode(joint, "childJoint", PropertyValueRemoved);
+            d->update();
 
         d->m_childJoints.removeOne(joint);
 
@@ -390,21 +388,6 @@ QString QJoint::name() const
     return d->m_name;
 }
 
-/*! \internal */
-Qt3DCore::QNodeCreatedChangeBasePtr QJoint::createNodeCreationChange() const
-{
-    auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QJointData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QJoint);
-    data.inverseBindMatrix = d->m_inverseBindMatrix;
-    data.childJointIds = qIdsForNodes(d->m_childJoints);
-    data.rotation = d->m_rotation;
-    data.scale = d->m_scale;
-    data.translation = d->m_translation;
-    data.name = d->m_name;
-    return creationChange;
-}
-
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/transforms/qjoint.h b/src/core/transforms/qjoint.h
index d3672e99f..1bd404a1a 100644
--- a/src/core/transforms/qjoint.h
+++ b/src/core/transforms/qjoint.h
@@ -105,7 +105,6 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QJoint)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DCore
diff --git a/src/core/transforms/qskeleton.cpp b/src/core/transforms/qskeleton.cpp
index 141d8c0c4..751daaabe 100644
--- a/src/core/transforms/qskeleton.cpp
+++ b/src/core/transforms/qskeleton.cpp
@@ -40,7 +40,6 @@
 #include "qskeleton.h"
 #include "qskeleton_p.h"
 #include <Qt3DCore/qjoint.h>
-#include <Qt3DCore/private/qskeletoncreatedchange_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -50,7 +49,7 @@ QSkeletonPrivate::QSkeletonPrivate()
     : QAbstractSkeletonPrivate()
     , m_rootJoint(nullptr)
 {
-    m_type = QSkeletonCreatedChangeBase::Skeleton;
+    m_type = Skeleton;
 }
 
 /*!
@@ -137,16 +136,6 @@ void QSkeleton::setRootJoint(Qt3DCore::QJoint *rootJoint)
     }
 }
 
-/*! \internal */
-Qt3DCore::QNodeCreatedChangeBasePtr QSkeleton::createNodeCreationChange() const
-{
-    auto creationChange = QSkeletonCreatedChangePtr<QSkeletonData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QSkeleton);
-    data.rootJointId = qIdForNode(d->m_rootJoint);
-    return creationChange;
-}
-
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/transforms/qskeleton.h b/src/core/transforms/qskeleton.h
index ecffe1aa9..51763b488 100644
--- a/src/core/transforms/qskeleton.h
+++ b/src/core/transforms/qskeleton.h
@@ -69,7 +69,6 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QSkeleton)
-    QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DCore
diff --git a/src/core/transforms/qskeletonloader.cpp b/src/core/transforms/qskeletonloader.cpp
index b1a311a0c..e86c72fbf 100644
--- a/src/core/transforms/qskeletonloader.cpp
+++ b/src/core/transforms/qskeletonloader.cpp
@@ -40,8 +40,6 @@
 #include "qskeletonloader.h"
 #include "qskeletonloader_p.h"
 #include <Qt3DCore/qjoint.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/private/qskeletoncreatedchange_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -54,7 +52,7 @@ QSkeletonLoaderPrivate::QSkeletonLoaderPrivate()
     , m_status(QSkeletonLoader::NotReady)
     , m_rootJoint(nullptr)
 {
-    m_type = QSkeletonCreatedChangeBase::SkeletonLoader;
+    m_type = SkeletonLoader;
 }
 
 void QSkeletonLoaderPrivate::setStatus(QSkeletonLoader::Status status)
@@ -241,23 +239,6 @@ void QSkeletonLoader::setRootJoint(QJoint *rootJoint)
     d->setRootJoint(rootJoint);
 }
 
-/*! \internal */
-void QSkeletonLoader::sceneChangeEvent(const QSceneChangePtr &change)
-{
-    QAbstractSkeleton::sceneChangeEvent(change);
-}
-
-/*! \internal */
-Qt3DCore::QNodeCreatedChangeBasePtr QSkeletonLoader::createNodeCreationChange() const
-{
-    auto creationChange = QSkeletonCreatedChangePtr<QSkeletonLoaderData>::create(this);
-    auto &data = creationChange->data;
-    Q_D(const QSkeletonLoader);
-    data.source = d->m_source;
-    data.createJoints = d->m_createJoints;
-    return creationChange;
-}
-
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/transforms/qskeletonloader.h b/src/core/transforms/qskeletonloader.h
index 516a84b0a..23b8cdda4 100644
--- a/src/core/transforms/qskeletonloader.h
+++ b/src/core/transforms/qskeletonloader.h
@@ -89,11 +89,9 @@ Q_SIGNALS:
 
 protected:
     explicit QSkeletonLoader(QSkeletonLoaderPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QSkeletonLoader)
-    QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
     void setRootJoint(QJoint *rootJoint); // Needed for lifetime management of created joints
 };
 
diff --git a/src/core/transforms/qskeletonloader_p.h b/src/core/transforms/qskeletonloader_p.h
index 6bd4e1eef..3284b772a 100644
--- a/src/core/transforms/qskeletonloader_p.h
+++ b/src/core/transforms/qskeletonloader_p.h
@@ -54,8 +54,6 @@
 #include <Qt3DCore/private/qabstractskeleton_p.h>
 #include "qskeletonloader.h"
 
-#include <Qt3DCore/private/qtypedpropertyupdatechange_p.h>
-
 #include <memory>
 
 QT_BEGIN_NAMESPACE
@@ -89,8 +87,6 @@ struct QSkeletonLoaderData
 };
 
 class QJoint;
-typedef QTypedPropertyUpdatedChange<std::unique_ptr<QJoint>> QJointChange;
-typedef QTypedPropertyUpdatedChangePtr<std::unique_ptr<QJoint>> QJointChangePtr;
 
 } // namespace Qt3DCore
 
diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp
index d41b87f79..edbca7280 100644
--- a/src/core/transforms/qtransform.cpp
+++ b/src/core/transforms/qtransform.cpp
@@ -40,8 +40,6 @@
 #include "qtransform.h"
 #include "qtransform_p.h"
 
-#include <Qt3DCore/qpropertyupdatedchange.h>
-
 #include <Qt3DCore/private/qmath3d_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -234,35 +232,15 @@ QTransform::QTransform(QTransformPrivate &dd, QNode *parent)
 {
 }
 
-/*!
-    \internal
- */
-// TODO Unused remove in Qt6
-void QTransform::sceneChangeEvent(const QSceneChangePtr &change)
-{
-    Q_D(QTransform);
-    switch (change->type()) {
-    case PropertyUpdated: {
-        Qt3DCore::QPropertyUpdatedChangePtr propertyChange = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(change);
-        if (propertyChange->propertyName() == QByteArrayLiteral("worldMatrix")) {
-            const bool blocked = blockNotifications(true);
-            d->setWorldMatrix(propertyChange->value().value<QMatrix4x4>());
-            blockNotifications(blocked);
-        }
-        break;
-    }
-    default:
-        break;
-    }
-}
-
 void QTransformPrivate::setWorldMatrix(const QMatrix4x4 &worldMatrix)
 {
     Q_Q(QTransform);
     if (m_worldMatrix == worldMatrix)
         return;
+    const bool blocked = q->blockNotifications(true);
     m_worldMatrix = worldMatrix;
     emit q->worldMatrixChanged(worldMatrix);
+    q->blockNotifications(blocked);
 }
 
 void QTransform::setMatrix(const QMatrix4x4 &m)
@@ -631,19 +609,6 @@ QMatrix4x4 QTransform::rotateFromAxes(const QVector3D &xAxis, const QVector3D &y
                       0.0f, 0.0f, 0.0f, 1.0f);
 }
 
-QNodeCreatedChangeBasePtr QTransform::createNodeCreationChange() const
-{
-    auto creationChange = QNodeCreatedChangePtr<QTransformData>::create(this);
-    auto &data = creationChange->data;
-
-    Q_D(const QTransform);
-    data.rotation = d->m_rotation;
-    data.scale = d->m_scale;
-    data.translation = d->m_translation;
-
-    return creationChange;
-}
-
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h
index ce6bf42fa..fa2d84baf 100644
--- a/src/core/transforms/qtransform.h
+++ b/src/core/transforms/qtransform.h
@@ -119,12 +119,9 @@ Q_SIGNALS:
 
 protected:
     explicit QTransform(QTransformPrivate &dd, QNode *parent = nullptr);
-    // TODO Unused remove in Qt6
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QTransform)
-    QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DCore