1 files changed, 26 insertions, 32 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
index 078dc67cad..9f803e411d 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
@@ -43,12 +43,12 @@
 #include "qcocoahelpers.h"
 #include "qcocoawindow.h"
 #include "private/qaccessiblecache_p.h"
-
+#include <QtPlatformSupport/private/qaccessiblebridgeutils_p.h>
 #include <QtGui/qaccessible.h>
 
 #import <AppKit/NSAccessibility.h>
 
-@implementation QCocoaAccessibleElement
+@implementation QMacAccessibilityElement
 
 - (id)initWithId:(QAccessible::Id)anId
 {
@@ -72,7 +72,7 @@
 
     QAccessibleCache *cache = QAccessibleCache::instance();
 
-    QCocoaAccessibleElement *element = cache->elementForId(anId);
+    QMacAccessibilityElement *element = cache->elementForId(anId);
     if (!element) {
         QAccessibleInterface *iface = QAccessible::accessibleInterface(anId);
         Q_ASSERT(iface);
@@ -95,8 +95,8 @@
 }
 
 - (BOOL)isEqual:(id)object {
-    if ([object isKindOfClass:[QCocoaAccessibleElement class]]) {
-        QCocoaAccessibleElement *other = object;
+    if ([object isKindOfClass:[QMacAccessibilityElement class]]) {
+        QMacAccessibilityElement *other = object;
         return other->axid == axid;
     } else {
         return NO;
@@ -196,7 +196,7 @@
     }
 
     QAccessible::Id parentId = QAccessible::uniqueId(parent);
-    return [QCocoaAccessibleElement elementWithId: parentId];
+    return [QMacAccessibilityElement elementWithId: parentId];
 }
 
 
@@ -345,7 +345,7 @@
     }
     if ([attribute isEqualToString: NSAccessibilityLineForIndexParameterizedAttribute]) {
         int index = [parameter intValue];
-        NSNumber *ln = [QCocoaAccessibleElement lineNumberForIndex: index forText: iface->text(QAccessible::Value)];
+        NSNumber *ln = [QMacAccessibilityElement lineNumberForIndex: index forText: iface->text(QAccessible::Value)];
         return ln;
     }
     if ([attribute isEqualToString: NSAccessibilityRangeForLineParameterizedAttribute]) {
@@ -430,15 +430,11 @@
     if (!iface)
         return nsActions;
 
-    QAccessibleActionInterface *actionInterface = iface->actionInterface();
-    if (actionInterface) {
-        QStringList supportedActionNames = actionInterface->actionNames();
-
-        foreach (const QString &qtAction, supportedActionNames) {
-            NSString *nsAction = QCocoaAccessible::getTranslatedAction(qtAction);
-            if (nsAction)
-                [nsActions addObject : nsAction];
-        }
+    const QStringList &supportedActionNames = QAccessibleBridgeUtils::effectiveActionNames(iface);
+    foreach (const QString &qtAction, supportedActionNames) {
+        NSString *nsAction = QCocoaAccessible::getTranslatedAction(qtAction);
+        if (nsAction)
+            [nsActions addObject : nsAction];
     }
 
     return nsActions;
@@ -448,27 +444,25 @@
     QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
     if (!iface)
         return nil; // FIXME is that the right return type??
-    QAccessibleActionInterface *actionInterface = iface->actionInterface();
-    if (actionInterface) {
-        QString qtAction = QCocoaAccessible::translateAction(action);
-
-        // Return a description from the action interface if this action is not known to the OS.
-        if (qtAction.isEmpty()) {
-            QString description = actionInterface->localizedActionDescription(qtAction);
-            return QCFString::toNSString(description);
+    QString qtAction = QCocoaAccessible::translateAction(action);
+    QString description;
+    // Return a description from the action interface if this action is not known to the OS.
+    if (qtAction.isEmpty()) {
+        if (QAccessibleActionInterface *actionInterface = iface->actionInterface()) {
+            qtAction = QString::fromNSString((NSString *)action);
+            description = actionInterface->localizedActionDescription(qtAction);
         }
+    } else {
+        description = qAccessibleLocalizedActionDescription(qtAction);
     }
-
-    return NSAccessibilityActionDescription(action);
+    return QCFString::toNSString(description);
 }
 
 - (void)accessibilityPerformAction:(NSString *)action {
     QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
     if (iface) {
-        QAccessibleActionInterface *actionInterface = iface->actionInterface();
-        if (actionInterface) {
-            actionInterface->doAction(QCocoaAccessible::translateAction(action));
-        }
+        const QString qtAction = QCocoaAccessible::translateAction(action);
+        QAccessibleBridgeUtils::performEffectiveAction(iface, qtAction);
     }
 }
 
@@ -504,7 +498,7 @@
 
     QAccessible::Id childId = QAccessible::uniqueId(childInterface);
     // hit a child, forward to child accessible interface.
-    QCocoaAccessibleElement *accessibleElement = [QCocoaAccessibleElement elementWithId:childId];
+    QMacAccessibilityElement *accessibleElement = [QMacAccessibilityElement elementWithId:childId];
     if (accessibleElement)
         return NSAccessibilityUnignoredAncestor(accessibleElement);
     return NSAccessibilityUnignoredAncestor(self);
@@ -521,7 +515,7 @@
     QAccessibleInterface *childInterface = iface->focusChild();
     if (childInterface) {
         QAccessible::Id childAxid = QAccessible::uniqueId(childInterface);
-        QCocoaAccessibleElement *accessibleElement = [QCocoaAccessibleElement elementWithId:childAxid];
+        QMacAccessibilityElement *accessibleElement = [QMacAccessibilityElement elementWithId:childAxid];
         return NSAccessibilityUnignoredAncestor(accessibleElement);
     }