From 19186743096ca138b40352e9fc9f531c97b2f359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 6 Jul 2018 18:47:33 +0200
Subject: macOS: Organize QNSView accessibility code like the rest of the class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Drive-by style-fixes were applied as well.

Change-Id: I22c17925be41eeaac692ab776dd5b46791265cb3
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
---
 .../platforms/cocoa/qnsviewaccessibility.mm        | 91 ----------------------
 1 file changed, 91 deletions(-)
 delete mode 100644 src/plugins/platforms/cocoa/qnsviewaccessibility.mm

(limited to 'src/plugins/platforms/cocoa/qnsviewaccessibility.mm')

diff --git a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
deleted file mode 100644
index ab0036e175..0000000000
--- a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qnsview.h"
-#include "qcocoahelpers.h"
-#include "qcocoaaccessibility.h"
-#include "qcocoaaccessibilityelement.h"
-#include "qcocoaintegration.h"
-
-#include <QtGui/qaccessible.h>
-#include <QtCore/QDebug>
-
-#import <AppKit/NSAccessibility.h>
-
-#ifndef QT_NO_ACCESSIBILITY
-
-@implementation QNSView (QNSViewAccessibility)
-
-- (id)childAccessibleElement {
-    QCocoaWindow *platformWindow = self.platformWindow;
-    if (!platformWindow || !platformWindow->window()->accessibleRoot())
-        return nil;
-
-    QAccessible::Id childId = QAccessible::uniqueId(platformWindow->window()->accessibleRoot());
-    return [QMacAccessibilityElement elementWithId:childId];
-}
-
-// The QNSView is a container that the user does not interact directly with:
-// Remove it from the user-visible accessibility tree.
-- (BOOL)accessibilityIsIgnored {
-    return YES;
-}
-
-- (id)accessibilityAttributeValue:(NSString *)attribute {
-    // activate accessibility updates
-    QCocoaIntegration::instance()->accessibility()->setActive(true);
-
-    if ([attribute isEqualToString:NSAccessibilityChildrenAttribute]) {
-        return NSAccessibilityUnignoredChildrenForOnlyChild([self childAccessibleElement]);
-    } else {
-        return [super accessibilityAttributeValue:attribute];
-    }
-}
-
-- (id)accessibilityHitTest:(NSPoint)point {
-    return [[self childAccessibleElement] accessibilityHitTest: point];
-}
-
-- (id)accessibilityFocusedUIElement {
-    return [[self childAccessibleElement] accessibilityFocusedUIElement];
-}
-
-@end
-
-#endif // QT_NO_ACCESSIBILITY
-- 
cgit v1.2.3