From 1d8ae2799d607b86f1bea208c6e84bab16bc5012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Sun, 26 May 2024 21:38:22 +0200
Subject: [PATCH] QAccessibleCache: Generalize macOS-specific hooks to all
 Apple platforms

These are used from the iOS platform plugin as well, so rename the hooks
to make it clear what's going on.

Change-Id: I701550a189b0047b8c604c9c27986f780aa157d4
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit c3f1533fba88c2e9fc4ce238f68055e37675292c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/gui/accessible/qaccessiblecache.cpp    |  4 ++--
 src/gui/accessible/qaccessiblecache_mac.mm | 10 +++++-----
 src/gui/accessible/qaccessiblecache_p.h    |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/gui/accessible/qaccessiblecache.cpp b/src/gui/accessible/qaccessiblecache.cpp
index b41a2481f9d..5fff9338e4d 100644
--- a/src/gui/accessible/qaccessiblecache.cpp
+++ b/src/gui/accessible/qaccessiblecache.cpp
@@ -172,8 +172,8 @@ void QAccessibleCache::deleteInterface(QAccessible::Id id, QObject *obj)
         objectToId.remove(obj);
     delete iface;
 
-#ifdef Q_OS_MAC
-    removeCocoaElement(id);
+#ifdef Q_OS_APPLE
+    removeAccessibleElement(id);
 #endif
 }
 
diff --git a/src/gui/accessible/qaccessiblecache_mac.mm b/src/gui/accessible/qaccessiblecache_mac.mm
index 77a9613d38e..1c875391941 100644
--- a/src/gui/accessible/qaccessiblecache_mac.mm
+++ b/src/gui/accessible/qaccessiblecache_mac.mm
@@ -3,7 +3,7 @@
 
 #include "qaccessiblecache_p.h"
 
-// qcocoaaccessibilityelement.h in Cocoa platform plugin
+// qcocoaaccessibilityelement.h in platform plugin
 @interface QT_MANGLE_NAMESPACE(QMacAccessibilityElement)
 - (void)invalidate;
 @end
@@ -12,19 +12,19 @@ QT_BEGIN_NAMESPACE
 
 void QAccessibleCache::insertElement(QAccessible::Id axid, QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *element) const
 {
-    cocoaElements[axid] = element;
+    accessibleElements[axid] = element;
 }
 
-void QAccessibleCache::removeCocoaElement(QAccessible::Id axid)
+void QAccessibleCache::removeAccessibleElement(QAccessible::Id axid)
 {
     QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *element = elementForId(axid);
     [element invalidate];
-    cocoaElements.remove(axid);
+    accessibleElements.remove(axid);
 }
 
 QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *QAccessibleCache::elementForId(QAccessible::Id axid) const
 {
-    return cocoaElements.value(axid);
+    return accessibleElements.value(axid);
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/accessible/qaccessiblecache_p.h b/src/gui/accessible/qaccessiblecache_p.h
index d1abca0f5d7..6356969827a 100644
--- a/src/gui/accessible/qaccessiblecache_p.h
+++ b/src/gui/accessible/qaccessiblecache_p.h
@@ -41,7 +41,7 @@ public:
     QAccessible::Id insert(QObject *object, QAccessibleInterface *iface) const;
     void deleteInterface(QAccessible::Id id, QObject *obj = nullptr);
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_APPLE
     QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *elementForId(QAccessible::Id axid) const;
     void insertElement(QAccessible::Id axid, QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *element) const;
 #endif
@@ -56,9 +56,9 @@ private:
     mutable QHash<QAccessibleInterface *, QAccessible::Id> interfaceToId;
     mutable QMultiHash<QObject *, QPair<QAccessible::Id, const QMetaObject*>> objectToId;
 
-#ifdef Q_OS_MAC
-    void removeCocoaElement(QAccessible::Id axid);
-    mutable QHash<QAccessible::Id, QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *> cocoaElements;
+#ifdef Q_OS_APPLE
+    void removeAccessibleElement(QAccessible::Id axid);
+    mutable QHash<QAccessible::Id, QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *> accessibleElements;
 #endif
 
     friend class QAccessible;