summaryrefslogtreecommitdiffstats
path: root/src/core/qchangearbiter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/qchangearbiter.cpp')
-rw-r--r--src/core/qchangearbiter.cpp20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp
index 34e773f59..60cdc3bd2 100644
--- a/src/core/qchangearbiter.cpp
+++ b/src/core/qchangearbiter.cpp
@@ -49,7 +49,6 @@
#include <Qt3DCore/private/qabstractaspectjobmanager_p.h>
#include <Qt3DCore/private/qpostman_p.h>
#include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qsceneobserverinterface_p.h>
#include <mutex>
@@ -117,11 +116,8 @@ void QChangeArbiter::distributeQueueChanges(QChangeQueue *changeQueue)
if (change.isNull())
continue;
- if (change->type() == NodeCreated) {
+ if (change->type() == NodeCreated || change->type() == NodeDeleted) {
Q_ASSERT(false); // messages no longer used
- } else if (change->type() == NodeDeleted) {
- for (QSceneObserverInterface *observer : qAsConst(m_sceneObservers))
- observer->sceneNodeRemoved(change);
}
const QNodeId nodeId = change->subjectId();
@@ -207,13 +203,6 @@ void QChangeArbiter::registerObserver(QObserverInterface *observer,
observerList.append(QObserverPair(changeFlags, observer));
}
-// Called from the QAspectThread context, no need to lock
-void QChangeArbiter::registerSceneObserver(QSceneObserverInterface *observer)
-{
- if (!m_sceneObservers.contains(observer))
- m_sceneObservers << observer;
-}
-
void QChangeArbiter::unregisterObserver(QObserverInterface *observer, QNodeId nodeId)
{
const std::lock_guard<QRecursiveMutex> locker(m_mutex);;
@@ -229,13 +218,6 @@ void QChangeArbiter::unregisterObserver(QObserverInterface *observer, QNodeId no
}
}
-// Called from the QAspectThread context, no need to lock
-void QChangeArbiter::unregisterSceneObserver(QSceneObserverInterface *observer)
-{
- if (observer != nullptr)
- m_sceneObservers.removeOne(observer);
-}
-
void QChangeArbiter::sceneChangeEvent(const QSceneChangePtr &e)
{
// qCDebug(ChangeArbiter) << Q_FUNC_INFO << QThread::currentThread();