Make clearBackendNode private

Change-Id: I8645116f21a5c0b7a9c0785c1eeebd019bad7ad3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

3 files changed, 8 insertions, 7 deletions

diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index aae7eafad..555bd086d 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -108,7 +108,8 @@ void QAbstractAspect::sceneNodeRemoved(QSceneChangePtr &e)
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
     QNode *n = nodePtr.data();
-    QAbstractAspect::clearBackendNode(n);
+    Q_D(QAbstractAspect);
+    d->clearBackendNode(n);
 }
 
 QVariant QAbstractAspect::executeCommand(const QStringList &args)
@@ -149,23 +150,22 @@ QBackendNode *QAbstractAspect::createBackendNode(QNode *frontend) const
     return Q_NULLPTR;
 }
 
-void QAbstractAspect::clearBackendNode(QNode *frontend) const
+void QAbstractAspectPrivate::clearBackendNode(QNode *frontend) const
 {
-    Q_D(const QAbstractAspect);
     const QMetaObject *metaObj = frontend->metaObject();
     QBackendNodeFunctorPtr functor;
 
     while (metaObj != Q_NULLPTR && functor.isNull()) {
-        functor = d->m_backendCreatorFunctors.value(className(*metaObj));
+        functor = m_backendCreatorFunctors.value(className(*metaObj));
         metaObj = metaObj->superClass();
     }
     if (!functor.isNull()) {
         QBackendNode *backend = functor->get(frontend->id());
         if (backend != Q_NULLPTR) {
             QBackendNodePrivate *backendPriv = QBackendNodePrivate::get(backend);
-            d->m_arbiter->unregisterObserver(backendPriv, backend->peerUuid());
+            m_arbiter->unregisterObserver(backendPriv, backend->peerUuid());
             if (backend->mode() == QBackendNode::ReadWrite)
-                d->m_arbiter->scene()->removeObservable(backendPriv, backend->peerUuid());
+                m_arbiter->scene()->removeObservable(backendPriv, backend->peerUuid());
             functor->destroy(frontend->id());
         }
     }
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index 67edd2cf9..5591779b0 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -77,7 +77,6 @@ protected:
     void registerBackendType(const QMetaObject &, const QBackendNodeFunctorPtr &functor);
 
     QBackendNode *createBackendNode(QNode *frontend) const Q_DECL_OVERRIDE;
-    void clearBackendNode(QNode *frontend) const;
 
 private:
     virtual QVariant executeCommand(const QStringList &args);
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h
index f757ac927..558d28463 100644
--- a/src/core/aspects/qabstractaspect_p.h
+++ b/src/core/aspects/qabstractaspect_p.h
@@ -74,6 +74,8 @@ public:
     QServiceLocator *services() const;
     QAbstractAspectJobManager *jobManager() const;
 
+    void clearBackendNode(QNode *frontend) const;
+
     Q_DECLARE_PUBLIC(QAbstractAspect)
 
     QEntity *m_root;