Simplify the new ApplicationMangerWindow API

It makes no sense to expose the full QQuickWindow C++ API, when
QtQuick's Window only exposes a subset.

Change-Id: Ifac2c75bb8c108ad709cbc39b27d5b656fe8980a
Pick-to: 6.7
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

7 files changed, 5 insertions, 116 deletions

diff --git a/src/application-main-lib/waylandapplicationmanagerwindowimpl.cpp b/src/application-main-lib/waylandapplicationmanagerwindowimpl.cpp
index 6827393f..e30217f5 100644
--- a/src/application-main-lib/waylandapplicationmanagerwindowimpl.cpp
+++ b/src/application-main-lib/waylandapplicationmanagerwindowimpl.cpp
@@ -76,26 +76,10 @@ WaylandApplicationManagerWindowImpl::WaylandApplicationManagerWindowImpl(Applica
     // pass-through signals from the actual QQuickWindow
     QObject::connect(m_qwindow, &AMQuickWindowQmlImpl::frameSwapped,
                      window, &ApplicationManagerWindow::frameSwapped);
-    QObject::connect(m_qwindow, &AMQuickWindowQmlImpl::sceneGraphInitialized,
-                     window, &ApplicationManagerWindow::sceneGraphInitialized);
-    QObject::connect(m_qwindow, &AMQuickWindowQmlImpl::sceneGraphInvalidated,
-                     window, &ApplicationManagerWindow::sceneGraphInvalidated);
-    QObject::connect(m_qwindow, &AMQuickWindowQmlImpl::beforeSynchronizing,
-                     window, &ApplicationManagerWindow::beforeSynchronizing);
-    QObject::connect(m_qwindow, &AMQuickWindowQmlImpl::afterSynchronizing,
-                     window, &ApplicationManagerWindow::afterSynchronizing);
-    QObject::connect(m_qwindow, &AMQuickWindowQmlImpl::beforeRendering,
-                     window, &ApplicationManagerWindow::beforeRendering);
-    QObject::connect(m_qwindow, &AMQuickWindowQmlImpl::afterRendering,
-                     window, &ApplicationManagerWindow::afterRendering);
     QObject::connect(m_qwindow, &AMQuickWindowQmlImpl::afterAnimating,
                      window, &ApplicationManagerWindow::afterAnimating);
-    QObject::connect(m_qwindow, &AMQuickWindowQmlImpl::sceneGraphAboutToStop,
-                     window, &ApplicationManagerWindow::sceneGraphAboutToStop);
-    QObject::connect(m_qwindow, &AMQuickWindowQmlImpl::beforeFrameBegin,
-                     window, &ApplicationManagerWindow::beforeFrameBegin);
-    QObject::connect(m_qwindow, &AMQuickWindowQmlImpl::afterFrameEnd,
-                     window, &ApplicationManagerWindow::afterFrameEnd);
+    QObject::connect(m_qwindow, &AMQuickWindowQmlImpl::sceneGraphError,
+                     window, &ApplicationManagerWindow::sceneGraphError);
 }
 
 WaylandApplicationManagerWindowImpl::~WaylandApplicationManagerWindowImpl()
@@ -226,21 +210,6 @@ void WaylandApplicationManagerWindowImpl::showNormal()
     m_qwindow->showNormal();
 }
 
-void WaylandApplicationManagerWindowImpl::update()
-{
-    m_qwindow->update();
-}
-
-void WaylandApplicationManagerWindowImpl::releaseResources()
-{
-    m_qwindow->releaseResources();
-}
-
-void WaylandApplicationManagerWindowImpl::requestUpdate()
-{
-    m_qwindow->requestUpdate();
-}
-
 QString WaylandApplicationManagerWindowImpl::title() const
 {
     return m_qwindow->title();
diff --git a/src/application-main-lib/waylandapplicationmanagerwindowimpl.h b/src/application-main-lib/waylandapplicationmanagerwindowimpl.h
index 73a64eda..93331a55 100644
--- a/src/application-main-lib/waylandapplicationmanagerwindowimpl.h
+++ b/src/application-main-lib/waylandapplicationmanagerwindowimpl.h
@@ -71,13 +71,6 @@ public:
     void showMaximized() override;
     void showNormal() override;
 
-    // pass-through slots to the actual QQuickWindow
-    void update() override;
-    void releaseResources() override;
-
-    // pass-through slots to the actual QWindow
-    void requestUpdate() override;
-
 private:
     QPointer<ApplicationMain> m_applicationMain;
     AMQuickWindowQmlImpl *m_qwindow = nullptr;
diff --git a/src/manager-lib/qmlinprocapplicationmanagerwindowimpl.cpp b/src/manager-lib/qmlinprocapplicationmanagerwindowimpl.cpp
index 4f382eb5..467a85ef 100644
--- a/src/manager-lib/qmlinprocapplicationmanagerwindowimpl.cpp
+++ b/src/manager-lib/qmlinprocapplicationmanagerwindowimpl.cpp
@@ -49,26 +49,10 @@ QmlInProcApplicationManagerWindowImpl::QmlInProcApplicationManagerWindowImpl(App
         // pass-through signals from the actual QQuickWindow
         QObject::connect(qwindow, &QQuickWindow::frameSwapped,
                          window, &ApplicationManagerWindow::frameSwapped);
-        QObject::connect(qwindow, &QQuickWindow::sceneGraphInitialized,
-                         window, &ApplicationManagerWindow::sceneGraphInitialized);
-        QObject::connect(qwindow, &QQuickWindow::sceneGraphInvalidated,
-                         window, &ApplicationManagerWindow::sceneGraphInvalidated);
-        QObject::connect(qwindow, &QQuickWindow::beforeSynchronizing,
-                         window, &ApplicationManagerWindow::beforeSynchronizing);
-        QObject::connect(qwindow, &QQuickWindow::afterSynchronizing,
-                         window, &ApplicationManagerWindow::afterSynchronizing);
-        QObject::connect(qwindow, &QQuickWindow::beforeRendering,
-                         window, &ApplicationManagerWindow::beforeRendering);
-        QObject::connect(qwindow, &QQuickWindow::afterRendering,
-                         window, &ApplicationManagerWindow::afterRendering);
         QObject::connect(qwindow, &QQuickWindow::afterAnimating,
                          window, &ApplicationManagerWindow::afterAnimating);
-        QObject::connect(qwindow, &QQuickWindow::sceneGraphAboutToStop,
-                         window, &ApplicationManagerWindow::sceneGraphAboutToStop);
-        QObject::connect(qwindow, &QQuickWindow::beforeFrameBegin,
-                         window, &ApplicationManagerWindow::beforeFrameBegin);
-        QObject::connect(qwindow, &QQuickWindow::afterFrameEnd,
-                         window, &ApplicationManagerWindow::afterFrameEnd);
+        QObject::connect(qwindow, &QQuickWindow::sceneGraphError,
+                         window, &ApplicationManagerWindow::sceneGraphError);
     };
 
     connectWindowSignals(m_surfaceItem->window());
@@ -220,21 +204,6 @@ void QmlInProcApplicationManagerWindowImpl::showNormal()
     updateVisibility(QWindow::Windowed);
 }
 
-void QmlInProcApplicationManagerWindowImpl::update()
-{
-    m_surfaceItem->window()->update();
-}
-
-void QmlInProcApplicationManagerWindowImpl::releaseResources()
-{
-    m_surfaceItem->window()->releaseResources();
-}
-
-void QmlInProcApplicationManagerWindowImpl::requestUpdate()
-{
-    m_surfaceItem->window()->requestUpdate();
-}
-
 bool QmlInProcApplicationManagerWindowImpl::setWindowProperty(const QString &name, const QVariant &value)
 {
     return m_surfaceItem->setWindowProperty(name, value);
diff --git a/src/manager-lib/qmlinprocapplicationmanagerwindowimpl.h b/src/manager-lib/qmlinprocapplicationmanagerwindowimpl.h
index db5acf33..d1c25aa2 100644
--- a/src/manager-lib/qmlinprocapplicationmanagerwindowimpl.h
+++ b/src/manager-lib/qmlinprocapplicationmanagerwindowimpl.h
@@ -74,13 +74,6 @@ public:
     void showMaximized() override;
     void showNormal() override;
 
-    // pass-through slots to the actual QQuickWindow
-    void update() override;
-    void releaseResources() override;
-
-    // pass-through slots to the actual QWindow
-    void requestUpdate() override;
-
 private:
     void notifyRuntimeAboutSurface();
     void determineRuntime();
diff --git a/src/shared-main-lib/applicationmanagerwindow.cpp b/src/shared-main-lib/applicationmanagerwindow.cpp
index 83d2a3da..fa9b61b4 100644
--- a/src/shared-main-lib/applicationmanagerwindow.cpp
+++ b/src/shared-main-lib/applicationmanagerwindow.cpp
@@ -238,21 +238,6 @@ void ApplicationManagerWindow::showNormal()
     m_impl->showNormal();
 }
 
-void QtAM::ApplicationManagerWindow::update()
-{
-    m_impl->update();
-}
-
-void QtAM::ApplicationManagerWindow::releaseResources()
-{
-    m_impl->releaseResources();
-}
-
-void QtAM::ApplicationManagerWindow::requestUpdate()
-{
-    m_impl->requestUpdate();
-}
-
 ApplicationManagerWindowImpl *ApplicationManagerWindow::implementation()
 {
     return m_impl.get();
diff --git a/src/shared-main-lib/applicationmanagerwindow.h b/src/shared-main-lib/applicationmanagerwindow.h
index d44e931e..64b25b10 100644
--- a/src/shared-main-lib/applicationmanagerwindow.h
+++ b/src/shared-main-lib/applicationmanagerwindow.h
@@ -132,21 +132,8 @@ public:
 
     // pass-through signals and slots from/to the actual QQuickWindow
     Q_SIGNAL void frameSwapped();
-    Q_SIGNAL void sceneGraphInitialized();
-    Q_SIGNAL void sceneGraphInvalidated();
-    Q_SIGNAL void beforeSynchronizing();
-    Q_SIGNAL void afterSynchronizing();
-    Q_SIGNAL void beforeRendering();
-    Q_SIGNAL void afterRendering();
     Q_SIGNAL void afterAnimating();
-    Q_SIGNAL void sceneGraphAboutToStop();
-    Q_SIGNAL void beforeFrameBegin();
-    Q_SIGNAL void afterFrameEnd();
-    Q_SLOT void update();
-    Q_SLOT void releaseResources();
-
-    // pass-through signals and slots from/to the actual QWindow
-    void requestUpdate();
+    Q_SIGNAL void sceneGraphError(QQuickWindow::SceneGraphError error, const QString &message);
 
     ApplicationManagerWindowImpl *implementation();
 
diff --git a/src/shared-main-lib/applicationmanagerwindowimpl.h b/src/shared-main-lib/applicationmanagerwindowimpl.h
index 624bca3a..4e06338a 100644
--- a/src/shared-main-lib/applicationmanagerwindowimpl.h
+++ b/src/shared-main-lib/applicationmanagerwindowimpl.h
@@ -78,13 +78,6 @@ public:
     virtual void showMaximized() = 0;
     virtual void showNormal() = 0;
 
-    // pass-through slots to the actual QQuickWindow
-    virtual void update() = 0;
-    virtual void releaseResources() = 0;
-
-    // pass-through slots to the actual QWindow
-    virtual void requestUpdate() = 0;
-
 protected:
     ApplicationManagerWindowImpl(ApplicationManagerWindow *window);