Make QSceneObserverInterface private

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

8 files changed, 30 insertions, 21 deletions

diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index e5472e094..7dd3d277f 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -94,23 +94,21 @@ void QAbstractAspect::registerBackendType(const QMetaObject &obj, const QBackend
     d->m_backendCreatorFunctors.insert(className(obj), functor);
 }
 
-void QAbstractAspect::sceneNodeAdded(QSceneChangePtr &e)
+void QAbstractAspectPrivate::sceneNodeAdded(QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
     QNode *n = nodePtr.data();
-    Q_D(QAbstractAspect);
     QNodeVisitor visitor;
-    visitor.traverse(n, d, &QAbstractAspectPrivate::createBackendNode);
+    visitor.traverse(n, this, &QAbstractAspectPrivate::createBackendNode);
 }
 
-void QAbstractAspect::sceneNodeRemoved(QSceneChangePtr &e)
+void QAbstractAspectPrivate::sceneNodeRemoved(QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
     QNode *n = nodePtr.data();
-    Q_D(QAbstractAspect);
-    d->clearBackendNode(n);
+    clearBackendNode(n);
 }
 
 QVariant QAbstractAspect::executeCommand(const QStringList &args)
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index 312415f65..98b157cc0 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -41,7 +41,6 @@
 #include <QSharedPointer>
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qaspectjobproviderinterface.h>
-#include <Qt3DCore/qsceneobserverinterface.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -59,7 +58,6 @@ typedef QSharedPointer<QBackendNodeFunctor> QBackendNodeFunctorPtr;
 class QT3DCORESHARED_EXPORT QAbstractAspect
         : public QObject
         , public QAspectJobProviderInterface
-        , public QSceneObserverInterface
 {
     Q_OBJECT
 
@@ -76,9 +74,6 @@ protected:
 private:
     virtual QVariant executeCommand(const QStringList &args);
 
-    void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-
     virtual void onInitialize(const QVariantMap &data) = 0;
     virtual void onCleanup() = 0;
 
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h
index d17f01fc8..2870801aa 100644
--- a/src/core/aspects/qabstractaspect_p.h
+++ b/src/core/aspects/qabstractaspect_p.h
@@ -51,6 +51,7 @@
 #include <private/qobject_p.h>
 #include <private/qbackendnode_p.h>
 #include <private/qbackendnodefactory_p.h>
+#include <private/qsceneobserverinterface_p.h>
 #include <private/qt3dcore_global_p.h>
 #include <Qt3DCore/qabstractaspect.h>
 
@@ -69,6 +70,7 @@ class QServiceLocator;
 class QT3DCORE_PRIVATE_EXPORT QAbstractAspectPrivate
         : public QObjectPrivate
         , public QBackendNodeFactory
+        , public QSceneObserverInterface
 {
 public:
     QAbstractAspectPrivate();
@@ -81,6 +83,9 @@ public:
     QBackendNode *createBackendNode(QNode *frontend) const Q_DECL_OVERRIDE;
     void clearBackendNode(QNode *frontend) const;
 
+    void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+
     Q_DECLARE_PUBLIC(QAbstractAspect)
 
     QEntity *m_root;
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index 193c6f8cb..3c7816081 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -101,7 +101,7 @@ void QAspectManager::shutdown()
 
     Q_FOREACH (QAbstractAspect *aspect, m_aspects) {
         aspect->onCleanup();
-        m_changeArbiter->unregisterSceneObserver(aspect);
+        m_changeArbiter->unregisterSceneObserver(aspect->d_func());
     }
     // Aspects must be deleted in the Thread they were created in
 }
@@ -151,7 +151,7 @@ void QAspectManager::registerAspect(QAbstractAspect *aspect)
         QAbstractAspectPrivate::get(aspect)->m_jobManager = m_jobManager;
         QAbstractAspectPrivate::get(aspect)->m_arbiter = m_changeArbiter;
         // Register sceneObserver with the QChangeArbiter
-        m_changeArbiter->registerSceneObserver(aspect);
+        m_changeArbiter->registerSceneObserver(aspect->d_func());
         aspect->onInitialize(m_data);
     }
     else {
diff --git a/src/core/core.pri b/src/core/core.pri
index f93763678..45bd7a692 100644
--- a/src/core/core.pri
+++ b/src/core/core.pri
@@ -24,7 +24,7 @@ HEADERS += \
     $$PWD/qscenepropertychange.h \
     $$PWD/qscenechange_p.h \
     $$PWD/qscenepropertychange_p.h \
-    $$PWD/qsceneobserverinterface.h \
+    $$PWD/qsceneobserverinterface_p.h \
     $$PWD/qpostman_p.h \
     $$PWD/qbackendscenepropertychange.h \
     $$PWD/qbackendscenepropertychange_p.h \
diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp
index 09bda2b6d..e9a004d8c 100644
--- a/src/core/qchangearbiter.cpp
+++ b/src/core/qchangearbiter.cpp
@@ -38,7 +38,7 @@
 #include "qcomponent.h"
 #include "qabstractaspectjobmanager_p.h"
 
-#include "qsceneobserverinterface.h"
+#include "qsceneobserverinterface_p.h"
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/private/corelogging_p.h>
 #include <QMutexLocker>
diff --git a/src/core/qsceneobserverinterface.cpp b/src/core/qsceneobserverinterface.cpp
index e4333115d..f9b4556f2 100644
--- a/src/core/qsceneobserverinterface.cpp
+++ b/src/core/qsceneobserverinterface.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qsceneobserverinterface.h"
+#include "qsceneobserverinterface_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/qsceneobserverinterface.h b/src/core/qsceneobserverinterface_p.h
index 7e41ed654..b3f632ffb 100644
--- a/src/core/qsceneobserverinterface.h
+++ b/src/core/qsceneobserverinterface_p.h
@@ -34,10 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QSCENEOBSERVERINTERFACE_H
-#define QT3DCORE_QSCENEOBSERVERINTERFACE_H
+#ifndef QT3DCORE_QSCENEOBSERVERINTERFACE_P_H
+#define QT3DCORE_QSCENEOBSERVERINTERFACE_P_H
 
-#include <Qt3DCore/qt3dcore_global.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DCore/private/qt3dcore_global_p.h>
 #include <Qt3DCore/qscenechange.h>
 
 QT_BEGIN_NAMESPACE
@@ -46,7 +57,7 @@ namespace Qt3DCore {
 
 class QChangeArbiter;
 
-class QT3DCORESHARED_EXPORT QSceneObserverInterface
+class QT3DCORE_PRIVATE_EXPORT QSceneObserverInterface
 {
 public:
     virtual ~QSceneObserverInterface();
@@ -64,4 +75,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Qt3DCore::QSceneObserverInterface *)
 
-#endif // QT3DCORE_QSCENEOBSERVERINTERFACE_H
+#endif // QT3DCORE_QSCENEOBSERVERINTERFACE_P_H