From 2f57263c413021716397841ca9d0bfc9628c8703 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周三, 06 12月 2023 18:28:52 +0800
Subject: [PATCH] Revert "update pointer usage"
---
src/core/contexts/win32windowcontext.cpp | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index a843e90..4a99a18 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -443,17 +443,11 @@
static WindowsNativeEventFilter *instance;
static inline void install() {
- if (instance) {
- return;
- }
instance = new WindowsNativeEventFilter();
installNativeEventFilter(instance);
}
static inline void uninstall() {
- if (!instance) {
- return;
- }
removeNativeEventFilter(instance);
delete instance;
instance = nullptr;
@@ -545,7 +539,7 @@
return ::CallWindowProcW(g_qtWindowProc, hWnd, message, wParam, lParam);
}
- Win32WindowContext::Win32WindowContext(const QObject *host, const WindowItemDelegate *delegate)
+ Win32WindowContext::Win32WindowContext(QObject *host, WindowItemDelegate *delegate)
: AbstractWindowContext(host, delegate) {
}
@@ -582,7 +576,9 @@
::SetWindowLongPtrW(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(QWKHookedWndProc));
// Install global native event filter
- WindowsNativeEventFilter::install();
+ if (!WindowsNativeEventFilter::instance) {
+ WindowsNativeEventFilter::install();
+ }
// Cache window ID
windowId = winId;
--
Gitblit v1.9.1