From 1fab480dc53e910a614d5d836993adb743d59352 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周六, 16 12月 2023 20:52:30 +0800 Subject: [PATCH] Remove redundant API --- src/core/contexts/cocoawindowcontext.mm | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm index 482f958..ffd3b87 100644 --- a/src/core/contexts/cocoawindowcontext.mm +++ b/src/core/contexts/cocoawindowcontext.mm @@ -15,10 +15,7 @@ } g_hook{}; #endif - class NSWindowProxy { - Q_DISABLE_COPY(NSWindowProxy) - - public: + struct NSWindowProxy { NSWindowProxy(NSWindow *macWindow) { if (instances.contains(macWindow)) { return; @@ -31,7 +28,7 @@ } } - ~NSWindowProxy() override { + ~NSWindowProxy() { instances.remove(nswindow); if (instances.count() <= 0) { restoreImplementations(); @@ -184,6 +181,8 @@ } private: + Q_DISABLE_COPY(NSWindowProxy) + NSWindow *nswindow = nil; // NSEvent *lastMouseDownEvent = nil; @@ -239,11 +238,9 @@ return it.value(); } - CocoaWindowContext::CocoaWindowContext() { - } + CocoaWindowContext::CocoaWindowContext() : AbstractWindowContext() {} - CocoaWindowContext::~CocoaWindowContext() { - } + CocoaWindowContext::~CocoaWindowContext() = default; QString CocoaWindowContext::key() const { return QStringLiteral("cocoa"); @@ -256,10 +253,7 @@ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) m_windowHandle->setProperty("_q_mac_wantsLayer", 1); #endif - WId winId = m_windowHandle->winId(); - ensureWindowProxy(winId)->setSystemTitleBarVisible(false); - // Cache window ID - windowId = winId; + ensureWindowProxy(m_windowHandle->winId())->setSystemTitleBarVisible(false); return true; } -- Gitblit v1.9.1