diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2019-12-20 12:41:04 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-02-11 06:08:41 +0000 |
commit | b828609440a4771838c242b3ad9962ecd7a2fe99 (patch) | |
tree | 5da6bce0cda327c4cca96696bce512ec243cc1fd /src/quick3d | |
parent | b0eb152b82cdd9658154ff7d9ef9e764eccc1ebd (diff) |
Remove deprecated classes and functions
Mostly old messaging API
Change-Id: I17eb2206b2ede56d2f7d36375d5e711d6149019f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d')
-rw-r--r-- | src/quick3d/quick3dscene2d/items/qscene2d.cpp | 18 | ||||
-rw-r--r-- | src/quick3d/quick3dscene2d/items/qscene2d.h | 3 | ||||
-rw-r--r-- | src/quick3d/quick3dscene2d/items/scene2d.cpp | 10 | ||||
-rw-r--r-- | src/quick3d/quick3dscene2d/items/scene2d_p.h | 1 |
4 files changed, 2 insertions, 30 deletions
diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.cpp b/src/quick3d/quick3dscene2d/items/qscene2d.cpp index b12adb8ed..70516ff09 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/qscene2d.cpp @@ -280,20 +280,6 @@ void QScene2D::setOutput(Qt3DRender::QRenderTargetOutput *output) } } -Qt3DCore::QNodeCreatedChangeBasePtr QScene2D::createNodeCreationChange() const -{ - auto creationChange = Qt3DCore::QNodeCreatedChangePtr<QScene2DData>::create(this); - auto &data = creationChange->data; - Q_D(const QScene2D); - data.renderPolicy = d->m_renderManager->m_renderPolicy; - data.sharedObject = d->m_renderManager->m_sharedObject; - data.output = d->m_output ? d->m_output->id() : Qt3DCore::QNodeId(); - for (Qt3DCore::QEntity *e : d->m_entities) - data.entityIds.append(e->id()); - data.mouseEnabled = d->m_renderManager->m_mouseEnabled; - return creationChange; -} - bool QScene2D::isMouseEnabled() const { Q_D(const QScene2D); @@ -329,7 +315,7 @@ void QScene2D::addEntity(Qt3DCore::QEntity *entity) d->m_entities.append(entity); d->registerDestructionHelper(entity, &QScene2D::removeEntity, d->m_entities); - d->updateNode(entity, "entities", PropertyValueAdded); + d->update(); } } @@ -343,7 +329,7 @@ void QScene2D::removeEntity(Qt3DCore::QEntity *entity) d->m_entities.removeAll(entity); d->unregisterDestructionHelper(entity); - d->updateNode(entity, "entities", PropertyValueRemoved); + d->update(); } } diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.h b/src/quick3d/quick3dscene2d/items/qscene2d.h index 38eaf7359..e87c0be05 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d.h +++ b/src/quick3d/quick3dscene2d/items/qscene2d.h @@ -100,9 +100,6 @@ Q_SIGNALS: protected: Q_DECLARE_PRIVATE(QScene2D) - -private: - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // namespace Quick diff --git a/src/quick3d/quick3dscene2d/items/scene2d.cpp b/src/quick3d/quick3dscene2d/items/scene2d.cpp index 063464b95..dcc99ed8c 100644 --- a/src/quick3d/quick3dscene2d/items/scene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2d.cpp @@ -34,9 +34,6 @@ ** ****************************************************************************/ -#include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/qpropertynodeaddedchange.h> -#include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DCore/private/qscene_p.h> #include <Qt3DQuickScene2D/qscene2d.h> #include <Qt3DRender/qpicktriangleevent.h> @@ -457,9 +454,6 @@ bool Scene2D::registerObjectPickerEvents(Qt3DCore::QEntity *qentity) handlePickEvent(QEvent::MouseMove, pick); }); - Qt3DCore::QBackendNodePrivate *priv = Qt3DCore::QBackendNodePrivate::get(this); - Qt3DCore::QChangeArbiter *arbiter = static_cast<Qt3DCore::QChangeArbiter*>(priv->m_arbiter); - arbiter->registerObserver(d_ptr, entity->componentUuid<ObjectPicker>()); return true; } @@ -469,10 +463,6 @@ void Scene2D::unregisterObjectPickerEvents(Qt3DCore::QNodeId entityId) if (!resourceAccessor()->accessResource(RenderBackendResourceAccessor::EntityHandle, entityId, (void**)&entity, nullptr)) return; - - Qt3DCore::QBackendNodePrivate *priv = Qt3DCore::QBackendNodePrivate::get(this); - Qt3DCore::QChangeArbiter *arbiter = static_cast<Qt3DCore::QChangeArbiter*>(priv->m_arbiter); - arbiter->unregisterObserver(d_ptr, entity->componentUuid<ObjectPicker>()); } void Scene2D::handlePickEvent(int type, const Qt3DRender::QPickEvent *ev) diff --git a/src/quick3d/quick3dscene2d/items/scene2d_p.h b/src/quick3d/quick3dscene2d/items/scene2d_p.h index 2f2b556ec..c7626f73d 100644 --- a/src/quick3d/quick3dscene2d/items/scene2d_p.h +++ b/src/quick3d/quick3dscene2d/items/scene2d_p.h @@ -49,7 +49,6 @@ // #include <Qt3DCore/qnodeid.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qpickevent.h> #include <Qt3DQuickScene2D/qscene2d.h> |