From 7c43f566651754863b2d66187b8228a2aed8c0ce Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Thu, 21 Sep 2023 11:52:56 +0300
Subject: [PATCH] Drop scene initialization functions

They are not needed anymore since the scenes are created when workspace
exists.
---
 src/compositor_wayland.cpp   |  4 ----
 src/compositor_x11.cpp       |  3 ---
 src/scene/cursorscene.cpp    | 14 +++++---------
 src/scene/cursorscene.h      |  2 --
 src/scene/workspacescene.cpp | 12 ++++--------
 5 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/compositor_wayland.cpp b/src/compositor_wayland.cpp
index 4f93b5fa45..687f664e38 100644
--- a/src/compositor_wayland.cpp
+++ b/src/compositor_wayland.cpp
@@ -182,10 +182,6 @@ void WaylandCompositor::start()
 
     Q_EMIT sceneCreated();
 
-    Q_ASSERT(m_scene);
-    m_scene->initialize();
-    m_cursorScene->initialize();
-
     const QList<Output *> outputs = workspace()->outputs();
     for (Output *output : outputs) {
         addOutput(output);
diff --git a/src/compositor_x11.cpp b/src/compositor_x11.cpp
index abcd2790bf..a3d7ed0461 100644
--- a/src/compositor_x11.cpp
+++ b/src/compositor_x11.cpp
@@ -330,9 +330,6 @@ void X11Compositor::start()
 
     kwinApp()->setX11CompositeWindow(backend()->overlayWindow()->window());
 
-    Q_ASSERT(m_scene);
-    m_scene->initialize();
-
     auto workspaceLayer = new RenderLayer(workspace()->outputs()[0]->renderLoop());
     workspaceLayer->setDelegate(std::make_unique<SceneDelegate>(m_scene.get(), nullptr));
     workspaceLayer->setGeometry(workspace()->geometry());
diff --git a/src/scene/cursorscene.cpp b/src/scene/cursorscene.cpp
index 4e277362a0..f9dcb02ec6 100644
--- a/src/scene/cursorscene.cpp
+++ b/src/scene/cursorscene.cpp
@@ -17,6 +17,11 @@ namespace KWin
 CursorScene::CursorScene(std::unique_ptr<ItemRenderer> &&renderer)
     : Scene(std::move(renderer))
 {
+    m_rootItem = std::make_unique<CursorItem>(this);
+    setGeometry(m_rootItem->boundingRect().toRect());
+    connect(m_rootItem.get(), &Item::boundingRectChanged, this, [this]() {
+        setGeometry(m_rootItem->boundingRect().toRect());
+    });
 }
 
 CursorScene::~CursorScene()
@@ -26,15 +31,6 @@ CursorScene::~CursorScene()
     m_rootItem.reset();
 }
 
-void CursorScene::initialize()
-{
-    m_rootItem = std::make_unique<CursorItem>(this);
-    setGeometry(m_rootItem->boundingRect().toRect());
-    connect(m_rootItem.get(), &Item::boundingRectChanged, this, [this]() {
-        setGeometry(m_rootItem->boundingRect().toRect());
-    });
-}
-
 static void resetRepaintsHelper(Item *item, SceneDelegate *delegate)
 {
     item->resetRepaints(delegate);
diff --git a/src/scene/cursorscene.h b/src/scene/cursorscene.h
index 91bb8b6d5b..b0970dc91d 100644
--- a/src/scene/cursorscene.h
+++ b/src/scene/cursorscene.h
@@ -22,8 +22,6 @@ public:
     explicit CursorScene(std::unique_ptr<ItemRenderer> &&renderer);
     ~CursorScene() override;
 
-    void initialize();
-
     void prePaint(SceneDelegate *delegate) override;
     void postPaint() override;
     void paint(const RenderTarget &renderTarget, const QRegion &region) override;
diff --git a/src/scene/workspacescene.cpp b/src/scene/workspacescene.cpp
index fbc734082b..cf0173df28 100644
--- a/src/scene/workspacescene.cpp
+++ b/src/scene/workspacescene.cpp
@@ -85,14 +85,6 @@ namespace KWin
 WorkspaceScene::WorkspaceScene(std::unique_ptr<ItemRenderer> renderer)
     : Scene(std::move(renderer))
     , m_containerItem(std::make_unique<Item>(this))
-{
-}
-
-WorkspaceScene::~WorkspaceScene()
-{
-}
-
-void WorkspaceScene::initialize()
 {
     setGeometry(workspace()->geometry());
     connect(workspace(), &Workspace::geometryChanged, this, [this]() {
@@ -105,6 +97,10 @@ void WorkspaceScene::initialize()
     }
 }
 
+WorkspaceScene::~WorkspaceScene()
+{
+}
+
 void WorkspaceScene::createDndIconItem()
 {
     DragAndDropIcon *dragIcon = waylandServer()->seat()->dragIcon();