From 3d50f3133ddbbd7136dca8173cf9164b78121823 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: 周四, 07 12月 2023 17:45:20 +0800
Subject: [PATCH] reorder code

---
 src/core/corewindowagent.cpp |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/core/corewindowagent.cpp b/src/core/corewindowagent.cpp
index 78ed335..d5dff5a 100644
--- a/src/core/corewindowagent.cpp
+++ b/src/core/corewindowagent.cpp
@@ -21,24 +21,23 @@
     void CoreWindowAgentPrivate::init() {
     }
 
-    bool CoreWindowAgentPrivate::setup(QWindow *window, WindowItemDelegate *delegate) {
-        Q_ASSERT(window);
-        if (!window) {
-            return false;
-        }
-
-        auto handler =
+    AbstractWindowContext *CoreWindowAgentPrivate::createContext() const {
+        return
 #ifdef Q_OS_WINDOWS
-            new Win32WindowContext(window, delegate)
+            new Win32WindowContext()
 #else
-            new QtWindowContext(window, delegate)
+            new QtWindowContext()
 #endif
-            ;
-        if (!handler->setup()) {
-            delete handler;
+                ;
+    }
+
+
+    bool CoreWindowAgentPrivate::setup(QObject *host, WindowItemDelegate *delegate) {
+        std::unique_ptr<AbstractWindowContext> ctx(createContext());
+        if (!ctx->setup(host, delegate)) {
             return false;
         }
-        context.reset(handler);
+        context = std::move(ctx);
         return true;
     }
 

--
Gitblit v1.9.1