Make QAbstractFrontEndNodeManager private

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

12 files changed, 39 insertions, 15 deletions

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 5cfb01fb6..eaecab0ee 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -41,7 +41,7 @@ qt_internal_add_module(3DCore
         nodes/qnode.cpp nodes/qnode.h nodes/qnode_p.h
         nodes/qnodeid.cpp nodes/qnodeid.h
         nodes/qnodevisitor.cpp nodes/qnodevisitor_p.h
-        qabstractfrontendnodemanager.cpp qabstractfrontendnodemanager.h
+        qabstractfrontendnodemanager.cpp qabstractfrontendnodemanager_p.h
         qchangearbiter.cpp qchangearbiter_p.h
         qscene.cpp qscene_p.h
         qscheduler.cpp qscheduler_p.h
diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp
index 6d3fd7566..c75bb150e 100644
--- a/src/core/aspects/qaspectengine.cpp
+++ b/src/core/aspects/qaspectengine.cpp
@@ -288,6 +288,16 @@ void QAspectEnginePrivate::exitSimulationLoop()
         m_aspectManager->exitSimulationLoop();
 }
 
+QNode *QAspectEnginePrivate::lookupNode(QNodeId id) const
+{
+    return m_scene ? m_scene->lookupNode(id) : nullptr;
+}
+
+QList<QNode *> QAspectEnginePrivate::lookupNodes(const QList<QNodeId> &ids) const
+{
+    return m_scene ? m_scene->lookupNodes(ids) : QList<QNode *>{};
+}
+
 /*!
  Registers a new \a aspect to the AspectManager. The QAspectEngine takes
  ownership of the aspect and will delete it when the aspect is unregistered.
@@ -442,13 +452,13 @@ void QAspectEngine::processFrame()
 QNode *QAspectEngine::lookupNode(QNodeId id) const
 {
     Q_D(const QAspectEngine);
-    return d->m_scene ? d->m_scene->lookupNode(id) : nullptr;
+    return d->lookupNode(id);
 }
 
 QList<QNode *> QAspectEngine::lookupNodes(const QList<QNodeId> &ids) const
 {
     Q_D(const QAspectEngine);
-    return d->m_scene ? d->m_scene->lookupNodes(ids) : QList<QNode *>{};
+    return d->lookupNodes(ids);
 }
 
 /*!
diff --git a/src/core/aspects/qaspectengine.h b/src/core/aspects/qaspectengine.h
index a6592cf34..b6f668439 100644
--- a/src/core/aspects/qaspectengine.h
+++ b/src/core/aspects/qaspectengine.h
@@ -41,7 +41,6 @@
 #define QT3DCORE_QASPECTENGINE_H
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/qabstractfrontendnodemanager.h>
 #include <Qt3DCore/qnodeid.h>
 #include <QtCore/QList>
 #include <QtCore/QObject>
@@ -58,7 +57,7 @@ class QNode;
 
 typedef QSharedPointer<QEntity> QEntityPtr;
 
-class Q_3DCORESHARED_EXPORT QAspectEngine : public QObject, public QAbstractFrontEndNodeManager
+class Q_3DCORESHARED_EXPORT QAspectEngine : public QObject
 {
     Q_OBJECT
 public:
@@ -89,8 +88,8 @@ public:
 
     void processFrame();
 
-    QNode *lookupNode(QNodeId id) const override;
-    QList<QNode *> lookupNodes(const QList<QNodeId> &ids) const override;
+    QNode *lookupNode(QNodeId id) const;
+    QList<QNode *> lookupNodes(const QList<QNodeId> &ids) const;
 
 private:
     Q_DECLARE_PRIVATE(QAspectEngine)
diff --git a/src/core/aspects/qaspectengine_p.h b/src/core/aspects/qaspectengine_p.h
index e38f7fd30..5abdabd70 100644
--- a/src/core/aspects/qaspectengine_p.h
+++ b/src/core/aspects/qaspectengine_p.h
@@ -56,6 +56,7 @@
 
 #include <Qt3DCore/private/qaspectfactory_p.h>
 #include <Qt3DCore/private/qaspectengine_p.h>
+#include <Qt3DCore/private/qabstractfrontendnodemanager_p.h>
 #include <QtCore/private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -67,7 +68,7 @@ class QNode;
 class QAspectManager;
 class QScene;
 
-class Q_3DCORE_PRIVATE_EXPORT QAspectEnginePrivate : public QObjectPrivate
+class Q_3DCORE_PRIVATE_EXPORT QAspectEnginePrivate : public QObjectPrivate, public QAbstractFrontEndNodeManager
 {
 public:
     QAspectEnginePrivate();
@@ -95,6 +96,9 @@ public:
     void addNode(QNode *node);
     void removeNode(QNode *node);
 
+    QNode *lookupNode(QNodeId id) const override;
+    QList<QNode *> lookupNodes(const QList<QNodeId> &ids) const override;
+
     static QAspectEnginePrivate *get(QAspectEngine *engine);
 };
 
diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h
index ab1d1494c..bf1739721 100644
--- a/src/core/aspects/qaspectmanager_p.h
+++ b/src/core/aspects/qaspectmanager_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <Qt3DCore/qaspectengine.h>
-#include <Qt3DCore/qabstractfrontendnodemanager.h>
+#include <Qt3DCore/private/qabstractfrontendnodemanager_p.h>
 #include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qnodeid.h>
 #include <QtCore/QList>
diff --git a/src/core/qabstractfrontendnodemanager.cpp b/src/core/qabstractfrontendnodemanager.cpp
index 7b2ed5f3e..97fd12c9a 100644
--- a/src/core/qabstractfrontendnodemanager.cpp
+++ b/src/core/qabstractfrontendnodemanager.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qabstractfrontendnodemanager.h"
+#include "qabstractfrontendnodemanager_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/qabstractfrontendnodemanager.h b/src/core/qabstractfrontendnodemanager_p.h
index 3a42f05e1..60ccaa722 100644
--- a/src/core/qabstractfrontendnodemanager.h
+++ b/src/core/qabstractfrontendnodemanager_p.h
@@ -40,6 +40,17 @@
 #ifndef QT3DCORE_QABSTRACTFRONTENDNODEMANAGER_P_H
 #define QT3DCORE_QABSTRACTFRONTENDNODEMANAGER_P_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/qt3dcore_global.h>
 #include <Qt3DCore/qnodeid.h>
 
diff --git a/src/core/qscene_p.h b/src/core/qscene_p.h
index f31fc42e1..c5328d9d2 100644
--- a/src/core/qscene_p.h
+++ b/src/core/qscene_p.h
@@ -54,7 +54,7 @@
 #include <QtCore/QScopedPointer>
 
 #include <Qt3DCore/qnode.h>
-#include <Qt3DCore/qabstractfrontendnodemanager.h>
+#include <Qt3DCore/private/qabstractfrontendnodemanager_p.h>
 #include <QtCore/qscopedpointer.h>
 #include <Qt3DCore/private/qt3dcore_global_p.h>
 
diff --git a/src/render/jobs/calcboundingvolumejob.cpp b/src/render/jobs/calcboundingvolumejob.cpp
index 8d5affd5d..e11651628 100644
--- a/src/render/jobs/calcboundingvolumejob.cpp
+++ b/src/render/jobs/calcboundingvolumejob.cpp
@@ -41,7 +41,7 @@
 #include "calcboundingvolumejob_p.h"
 
 #include <Qt3DCore/qboundingvolume.h>
-#include <Qt3DCore/qabstractfrontendnodemanager.h>
+#include <Qt3DCore/private/qabstractfrontendnodemanager_p.h>
 #include <Qt3DCore/private/qgeometry_p.h>
 #include <Qt3DRender/private/nodemanagers_p.h>
 #include <Qt3DRender/private/entity_p.h>
diff --git a/tests/auto/render/commons/testaspect.h b/tests/auto/render/commons/testaspect.h
index 6f7043725..fa1c4a12c 100644
--- a/tests/auto/render/commons/testaspect.h
+++ b/tests/auto/render/commons/testaspect.h
@@ -42,7 +42,7 @@
 #include <Qt3DRender/private/abstractrenderer_p.h>
 #include <Qt3DCore/private/qaspectjobmanager_p.h>
 #include <Qt3DCore/private/qnodevisitor_p.h>
-#include <Qt3DCore/qabstractfrontendnodemanager.h>
+#include <Qt3DCore/private/qabstractfrontendnodemanager_p.h>
 #include <Qt3DRender/private/qrenderaspect_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
index 1b57e904e..f66e27793 100644
--- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
+++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
@@ -32,7 +32,7 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qtransform.h>
-#include <Qt3DCore/qabstractfrontendnodemanager.h>
+#include <Qt3DCore/private/qabstractfrontendnodemanager_p.h>
 #include <Qt3DCore/private/qaspectjobmanager_p.h>
 #include <Qt3DCore/private/qnodevisitor_p.h>
 #include <Qt3DCore/private/qaspectmanager_p.h>
diff --git a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
index ddf3d0f8b..37c2d20d7 100644
--- a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
+++ b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
@@ -32,7 +32,7 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qtransform.h>
-#include <Qt3DCore/qabstractfrontendnodemanager.h>
+#include <Qt3DCore/private/qabstractfrontendnodemanager_p.h>
 #include <Qt3DCore/private/qaspectjobmanager_p.h>
 #include <Qt3DCore/private/qnodevisitor_p.h>
 #include <Qt3DCore/private/qaspectmanager_p.h>