QAspectManager made private

Note: the export is maintained for the moment because the renderer aspect
still needs to know about that class. When the QBackendNode will be introduced
and QAbstractAspect refactored, this will be removed.

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

1 files changed, 29 insertions, 9 deletions

diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h
index d26e48d60..a67e32a2d 100644
--- a/src/core/aspects/qaspectmanager_p.h
+++ b/src/core/aspects/qaspectmanager_p.h
@@ -42,29 +42,49 @@
 #ifndef QT3D_QASPECTMANAGER_P_H
 #define QT3D_QASPECTMANAGER_P_H
 
-#include <private/qobject_p.h>
+#include <QObject>
+#include <QList>
+#include <Qt3DCore/qt3dcore_global.h>
 
 QT_BEGIN_NAMESPACE
 
+class QWaitCondition;
 class QWindow;
 
 namespace Qt3D {
 
-class QAbstractAspect;
-class QAspectManager;
-class QScheduler;
+class QNode;
 class QEntity;
+class QScheduler;
 class QChangeArbiter;
+class QAbstractAspect;
 class QJobManagerInterface;
 class QSceneObserverInterface;
 
-class QAspectManagerPrivate : public QObjectPrivate
+class QT3DCORESHARED_EXPORT QAspectManager : public QObject
 {
-public :
-    QAspectManagerPrivate(QAspectManager *qq);
+    Q_OBJECT
+public:
+    explicit QAspectManager(QObject *parent = 0);
+    ~QAspectManager();
+
+public Q_SLOTS:
+    void initialize();
+    void shutdown();
+
+    void setRoot(Qt3D::QNode *rootObject);
+    void setWindow(QWindow* window);
+    void registerAspect(Qt3D::QAbstractAspect *aspect);
+    QWindow *window() const;
+
+    void exec();
+    void quit();
 
-    Q_DECLARE_PUBLIC(QAspectManager)
+    const QList<QAbstractAspect *> &aspects() const;
+    QJobManagerInterface *jobManager() const;
+    QChangeArbiter *changeArbiter() const;
 
+private:
     QList<QAbstractAspect *> m_aspects;
     QEntity *m_root;
     QWindow *m_window;
@@ -75,7 +95,7 @@ public :
     QAtomicInt m_terminated;
 };
 
-} // Qt3D
+} // namespace Qt3D
 
 QT_END_NAMESPACE