From 8118355f39b114e309faad4574abf71c40bfe534 Mon Sep 17 00:00:00 2001
From: tobtoht <tob@featherwallet.org>
Date: Fri, 9 Aug 2024 23:30:30 +0200
Subject: [PATCH] macOS: remove deprecated screenshot function

---
 src/main/oshelper.cpp |  4 ----
 src/qt/macoshelper.h  |  1 -
 src/qt/macoshelper.mm | 35 -----------------------------------
 3 files changed, 40 deletions(-)

diff --git a/src/main/oshelper.cpp b/src/main/oshelper.cpp
index 766aac5dae..f9e33d1379 100644
--- a/src/main/oshelper.cpp
+++ b/src/main/oshelper.cpp
@@ -70,9 +70,6 @@ namespace
 
 QPixmap screenshot()
 {
-#ifdef Q_OS_MAC
-    return MacOSHelper::screenshot();
-#else
     std::unordered_set<QWindow *> hidden;
     const QWindowList windows = QGuiApplication::allWindows();
     for (QWindow *window : windows)
@@ -91,7 +88,6 @@ QPixmap screenshot()
     });
 
     return QGuiApplication::primaryScreen()->grabWindow(0);
-#endif
 }
 
 } // namespace
diff --git a/src/qt/macoshelper.h b/src/qt/macoshelper.h
index 7a7f2486f0..6bb7748d01 100644
--- a/src/qt/macoshelper.h
+++ b/src/qt/macoshelper.h
@@ -38,7 +38,6 @@ class MacOSHelper
 public:
     static bool isCapsLock();
     static bool openFolderAndSelectItem(const QUrl &path);
-    static QPixmap screenshot();
     static QString bundlePath();
     static void disableWindowTabbing();
 };
diff --git a/src/qt/macoshelper.mm b/src/qt/macoshelper.mm
index 47d22c44f4..eb96ef8487 100644
--- a/src/qt/macoshelper.mm
+++ b/src/qt/macoshelper.mm
@@ -68,41 +68,6 @@
     return true;
 }
 
-QPixmap MacOSHelper::screenshot()
-{
-    std::unordered_set<uintptr_t> appWindowIds;
-    for (NSWindow *window in [NSApp windows])
-    {
-        appWindowIds.insert((uintptr_t)[window windowNumber]);
-    }
-
-    CFArrayRef onScreenWindows = CGWindowListCreate(kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
-    const auto onScreenWindowsClenaup = sg::make_scope_guard([&onScreenWindows]() {
-        CFRelease(onScreenWindows);
-    });
-
-    CFMutableArrayRef foreignWindows = CFArrayCreateMutable(NULL, CFArrayGetCount(onScreenWindows), NULL);
-    const auto foreignWindowsClenaup = sg::make_scope_guard([&foreignWindows]() {
-        CFRelease(foreignWindows);
-    });
-
-    for (CFIndex index = 0, count = CFArrayGetCount(onScreenWindows); index < count; ++index)
-    {
-        const uintptr_t windowId = reinterpret_cast<const uintptr_t>(CFArrayGetValueAtIndex(onScreenWindows, index));
-        if (appWindowIds.find(windowId) == appWindowIds.end())
-        {
-            CFArrayAppendValue(foreignWindows, reinterpret_cast<const void *>(windowId));
-        }
-    }
-
-    CGImageRef image = CGWindowListCreateImageFromArray(CGRectInfinite, foreignWindows, kCGWindowListOptionAll);
-    const auto imageClenaup = sg::make_scope_guard([&image]() {
-        CFRelease(image);
-    });
-
-    return QtMac::fromCGImageRef(image);
-}
-
 QString MacOSHelper::bundlePath()
 {
     NSBundle *main = [NSBundle mainBundle];