From fb638f26c5fcef9e1836f1a1d07f6a0d521ede44 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Mon, 23 Oct 2023 20:16:05 +0300
Subject: [PATCH] libkwineffects: Drop QObject parent argument in
 OffscreenQuickView constructor

All usages of OffscreenQuickView have been ported to smart pointers. So
let's drop the QObject parent argument to simplify the API.
---
 src/effects.cpp                               | 10 +++-------
 src/effects.h                                 |  3 +--
 src/libkwineffects/kwinoffscreenquickview.cpp | 20 ++++---------------
 src/libkwineffects/kwinoffscreenquickview.h   | 11 ++--------
 src/libkwineffects/kwinquickeffect.cpp        |  3 +--
 5 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/src/effects.cpp b/src/effects.cpp
index ba62a648e8..4c6386d31f 100644
--- a/src/effects.cpp
+++ b/src/effects.cpp
@@ -2154,10 +2154,8 @@ EffectWindowList EffectWindowGroupImpl::members() const
 // EffectFrameImpl
 //****************************************
 
-EffectFrameQuickScene::EffectFrameQuickScene(EffectFrameStyle style, bool staticSize, QPoint position,
-                                             Qt::Alignment alignment, QObject *parent)
-    : OffscreenQuickScene(parent)
-    , m_style(style)
+EffectFrameQuickScene::EffectFrameQuickScene(EffectFrameStyle style, bool staticSize, QPoint position, Qt::Alignment alignment)
+    : m_style(style)
     , m_static(staticSize)
     , m_point(position)
     , m_alignment(alignment)
@@ -2366,9 +2364,7 @@ void EffectFrameQuickScene::reposition()
 }
 
 EffectFrameImpl::EffectFrameImpl(EffectFrameStyle style, bool staticSize, QPoint position, Qt::Alignment alignment)
-    : QObject(nullptr)
-    , EffectFrame()
-    , m_view(new EffectFrameQuickScene(style, staticSize, position, alignment, nullptr))
+    : m_view(new EffectFrameQuickScene(style, staticSize, position, alignment))
 {
     connect(m_view, &OffscreenQuickScene::repaintNeeded, this, [this] {
         effects->addRepaint(geometry());
diff --git a/src/effects.h b/src/effects.h
index 0078c39899..a112464331 100644
--- a/src/effects.h
+++ b/src/effects.h
@@ -506,8 +506,7 @@ class EffectFrameQuickScene : public OffscreenQuickScene
     Q_PROPERTY(qreal crossFadeProgress READ crossFadeProgress NOTIFY crossFadeProgressChanged)
 
 public:
-    EffectFrameQuickScene(EffectFrameStyle style, bool staticSize, QPoint position,
-                          Qt::Alignment alignment, QObject *parent = nullptr);
+    EffectFrameQuickScene(EffectFrameStyle style, bool staticSize, QPoint position, Qt::Alignment alignment);
     ~EffectFrameQuickScene() override;
 
     EffectFrameStyle style() const;
diff --git a/src/libkwineffects/kwinoffscreenquickview.cpp b/src/libkwineffects/kwinoffscreenquickview.cpp
index d15c6d5f3c..3633fbf910 100644
--- a/src/libkwineffects/kwinoffscreenquickview.cpp
+++ b/src/libkwineffects/kwinoffscreenquickview.cpp
@@ -73,14 +73,8 @@ public:
     std::unique_ptr<QQuickItem> quickItem;
 };
 
-OffscreenQuickView::OffscreenQuickView(QObject *parent)
-    : OffscreenQuickView(ExportMode::Texture, parent)
-{
-}
-
-OffscreenQuickView::OffscreenQuickView(ExportMode exportMode, QObject *parent)
-    : QObject(parent)
-    , d(new OffscreenQuickView::Private)
+OffscreenQuickView::OffscreenQuickView(ExportMode exportMode)
+    : d(new OffscreenQuickView::Private)
 {
     d->m_renderControl = std::make_unique<QQuickRenderControl>();
 
@@ -520,14 +514,8 @@ void OffscreenQuickView::Private::updateTouchState(Qt::TouchPointState state, qi
     }
 }
 
-OffscreenQuickScene::OffscreenQuickScene(QObject *parent)
-    : OffscreenQuickView(parent)
-    , d(new OffscreenQuickScene::Private)
-{
-}
-
-OffscreenQuickScene::OffscreenQuickScene(OffscreenQuickView::ExportMode exportMode, QObject *parent)
-    : OffscreenQuickView(exportMode, parent)
+OffscreenQuickScene::OffscreenQuickScene(OffscreenQuickView::ExportMode exportMode)
+    : OffscreenQuickView(exportMode)
     , d(new OffscreenQuickScene::Private)
 {
 }
diff --git a/src/libkwineffects/kwinoffscreenquickview.h b/src/libkwineffects/kwinoffscreenquickview.h
index 6a82264d73..6e20062755 100644
--- a/src/libkwineffects/kwinoffscreenquickview.h
+++ b/src/libkwineffects/kwinoffscreenquickview.h
@@ -56,16 +56,10 @@ public:
         Image
     };
 
-    /**
-     * Construct a new KWinQuickView
-     * Export mode will be determined by the current effectsHandler
-     */
-    explicit OffscreenQuickView(QObject *parent = nullptr);
-
     /**
      * Construct a new KWinQuickView explicitly stating an export mode
      */
-    explicit OffscreenQuickView(ExportMode exportMode = ExportMode::Texture, QObject *parent = nullptr);
+    explicit OffscreenQuickView(ExportMode exportMode = ExportMode::Texture);
 
     /**
      * Note that this may change the current GL Context
@@ -164,8 +158,7 @@ private:
 class KWINEFFECTS_EXPORT OffscreenQuickScene : public OffscreenQuickView
 {
 public:
-    explicit OffscreenQuickScene(QObject *parent = nullptr);
-    explicit OffscreenQuickScene(ExportMode exportMode, QObject *parent = nullptr);
+    explicit OffscreenQuickScene(ExportMode exportMode = ExportMode::Texture);
     ~OffscreenQuickScene();
 
     /** top level item in the given source*/
diff --git a/src/libkwineffects/kwinquickeffect.cpp b/src/libkwineffects/kwinquickeffect.cpp
index 447e951138..fc3b7b2e95 100644
--- a/src/libkwineffects/kwinquickeffect.cpp
+++ b/src/libkwineffects/kwinquickeffect.cpp
@@ -83,8 +83,7 @@ bool QuickSceneEffectPrivate::isItemOnScreen(QQuickItem *item, EffectScreen *scr
 }
 
 QuickSceneView::QuickSceneView(QuickSceneEffect *effect, EffectScreen *screen)
-    : OffscreenQuickView(effect)
-    , m_effect(effect)
+    : m_effect(effect)
     , m_screen(screen)
 {
     setGeometry(screen->geometry());