QAspectEngine/QAspectManager: setWindow -> setSurface

Change-Id: Ib6e2188bc5602f2684b49c7e1e37d62abb5a122f
Task-number:QTBUG-41521
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

4 files changed, 18 insertions, 24 deletions

diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp
index 18d2a5016..38d7d6deb 100644
--- a/src/core/aspects/qaspectengine.cpp
+++ b/src/core/aspects/qaspectengine.cpp
@@ -130,12 +130,12 @@ void QAspectEngine::shutdown()
     d->m_aspectThread->wait();
 }
 
-void QAspectEngine::setWindow(QWindow *window)
+void QAspectEngine::setSurface(QSurface *surface)
 {
     Q_D(QAspectEngine);
     QMetaObject::invokeMethod(d->m_aspectThread->aspectManager(),
-                              "setWindow",
-                              Q_ARG(QWindow *, window));
+                              "setSurface",
+                              Q_ARG(QSurface *, surface));
 }
 
 /*!
diff --git a/src/core/aspects/qaspectengine.h b/src/core/aspects/qaspectengine.h
index 2afa18dd1..96332517e 100644
--- a/src/core/aspects/qaspectengine.h
+++ b/src/core/aspects/qaspectengine.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWindow;
+class QSurface;
 
 namespace Qt3D {
 
@@ -67,7 +67,7 @@ public:
     void shutdown();
 
     void setRoot(QNode *rootObject);
-    void setWindow(QWindow *window);
+    void setSurface(QSurface *surface);
     void registerAspect(QAbstractAspect *aspect);
 
 protected:
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index 710657653..9d0d421b8 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -49,13 +49,11 @@
 #include "qscheduler.h"
 #include "qtickclock.h"
 #include "qentity.h"
-#include "qsceneobserverinterface.h"
 
 #include "corelogging.h"
 #include <QEventLoop>
 #include <QThread>
 #include <QWaitCondition>
-#include <QWindow>
 #include <QSurface>
 
 
@@ -66,12 +64,12 @@ namespace Qt3D {
 QAspectManager::QAspectManager(QObject *parent)
     : QObject(parent)
     , m_root(Q_NULLPTR)
-    , m_window(Q_NULLPTR)
+    , m_surface(Q_NULLPTR)
     , m_scheduler(new QScheduler(this))
     , m_jobManager(new QJobManager(this))
     , m_changeArbiter(new QChangeArbiter(this))
 {
-    qRegisterMetaType<QWindow*>("QWindow*");
+    qRegisterMetaType<QSurface *>("QSurface*");
     m_runMainLoop.fetchAndStoreOrdered(0);
     m_terminated.fetchAndStoreOrdered(0);
     qCDebug(Aspects) << Q_FUNC_INFO;
@@ -132,16 +130,12 @@ void QAspectManager::setRoot(QNode *rootObject)
 }
 
 // Called before register aspect
-void QAspectManager::setWindow(QWindow *window)
+void QAspectManager::setSurface(QSurface *surface)
 {
     qCDebug(Aspects) << Q_FUNC_INFO;
-    m_window = window;
-    // We need to create the window
-    // Otherwise aspects won't be able to initialize the glContext
-    // As show (which calls create) is only called after they're initialized
-    m_window->create();
+    m_surface = surface;
     Q_FOREACH (QAbstractAspect *aspect, m_aspects)
-        aspect->onInitialize(m_window);
+        aspect->onInitialize(m_surface);
 }
 
 /*!
@@ -157,8 +151,8 @@ void QAspectManager::registerAspect(QAbstractAspect *aspect)
         QAbstractAspectPrivate::get(aspect)->m_arbiter = m_changeArbiter;
         // Register sceneObserver with the QChangeArbiter
         m_changeArbiter->registerSceneObserver(aspect);
-        if (m_window != Q_NULLPTR)
-            aspect->onInitialize(m_window);
+        if (m_surface != Q_NULLPTR)
+            aspect->onInitialize(m_surface);
     }
     else {
         qCWarning(Aspects) << "Failed to register aspect";
@@ -166,9 +160,9 @@ void QAspectManager::registerAspect(QAbstractAspect *aspect)
     qCDebug(Aspects) << "Completed registering aspect";
 }
 
-QWindow *QAspectManager::window() const
+QSurface *QAspectManager::surface() const
 {
-    return m_window;
+    return m_surface;
 }
 
 void QAspectManager::exec()
diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h
index a67e32a2d..fa275f9ed 100644
--- a/src/core/aspects/qaspectmanager_p.h
+++ b/src/core/aspects/qaspectmanager_p.h
@@ -49,7 +49,7 @@
 QT_BEGIN_NAMESPACE
 
 class QWaitCondition;
-class QWindow;
+class QSurface;
 
 namespace Qt3D {
 
@@ -73,9 +73,9 @@ public Q_SLOTS:
     void shutdown();
 
     void setRoot(Qt3D::QNode *rootObject);
-    void setWindow(QWindow* window);
+    void setSurface(QSurface *surface);
     void registerAspect(Qt3D::QAbstractAspect *aspect);
-    QWindow *window() const;
+    QSurface *surface() const;
 
     void exec();
     void quit();
@@ -87,7 +87,7 @@ public Q_SLOTS:
 private:
     QList<QAbstractAspect *> m_aspects;
     QEntity *m_root;
-    QWindow *m_window;
+    QSurface *m_surface;
     QScheduler *m_scheduler;
     QJobManagerInterface *m_jobManager;
     QChangeArbiter *m_changeArbiter;