From 1133c0dd2230499b24d7f92634531bb633ee00f6 Mon Sep 17 00:00:00 2001
From: Jan-Arve Saether <jan-arve.saether@nokia.com>
Date: Fri, 6 Jan 2012 15:51:53 +0100
Subject: Remove all references to QAccessible::(Up|Down|Left|Right)

It is now the resonsibility of the bridge to support this
(by querying for QAccessibleInterface::rect())

The windows bridge (currently the only bridge in need of this) has
already been updated to reflect this in commit
7dca461620ee6d8cce3a74acf2e1530d4497bff9

Change-Id: Ief1339ab6edc118e2d47e3875e09fa885db65c2f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
---
 src/plugins/accessible/widgets/complexwidgets.cpp | 114 ----------------------
 1 file changed, 114 deletions(-)

(limited to 'src/plugins/accessible/widgets/complexwidgets.cpp')

diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp
index 94eb535791..a8f477e261 100644
--- a/src/plugins/accessible/widgets/complexwidgets.cpp
+++ b/src/plugins/accessible/widgets/complexwidgets.cpp
@@ -414,120 +414,6 @@ bool QAccessibleAbstractScrollArea::isValid() const
     return (QAccessibleWidget::isValid() && abstractScrollArea() && abstractScrollArea()->viewport());
 }
 
-int QAccessibleAbstractScrollArea::navigate(QAccessible::RelationFlag relation, int entry, QAccessibleInterface **target) const
-{
-    if (!target)
-        return -1;
-
-    *target = 0;
-
-    QWidget *targetWidget = 0;
-    QWidget *entryWidget = 0;
-
-    if (relation == QAccessible::Left || relation == QAccessible::Up || relation == QAccessible::Right || relation == QAccessible::Down) {
-        QWidgetList children = accessibleChildren();
-        if (entry < 0 || entry > children.count())
-            return -1;
-
-        if (entry == Self)
-            entryWidget = abstractScrollArea();
-        else
-            entryWidget = children.at(entry - 1);
-        AbstractScrollAreaElement entryElement = elementType(entryWidget);
-
-        // Not one of the most beautiful switches I've ever seen, but I believe it has
-        // to be like this since each case need special handling.
-        // It might be possible to make it more general, but I'll leave that as an exercise
-        // to the reader. :-)
-        switch (relation) {
-        case QAccessible::Left:
-            if (entry < 1)
-                break;
-            switch (entryElement) {
-            case Viewport:
-                if (!isLeftToRight())
-                    targetWidget = abstractScrollArea()->verticalScrollBar();
-                break;
-            case HorizontalContainer:
-                if (!isLeftToRight())
-                    targetWidget = abstractScrollArea()->cornerWidget();
-                break;
-            case VerticalContainer:
-                if (isLeftToRight())
-                    targetWidget = abstractScrollArea()->viewport();
-                break;
-            case CornerWidget:
-                if (isLeftToRight())
-                    targetWidget = abstractScrollArea()->horizontalScrollBar();
-                break;
-            default:
-                break;
-            }
-            break;
-        case QAccessible::Right:
-            if (entry < 1)
-                break;
-            switch (entryElement) {
-            case Viewport:
-                if (isLeftToRight())
-                    targetWidget = abstractScrollArea()->verticalScrollBar();
-                break;
-            case HorizontalContainer:
-                targetWidget = abstractScrollArea()->cornerWidget();
-                break;
-            case VerticalContainer:
-                if (!isLeftToRight())
-                    targetWidget = abstractScrollArea()->viewport();
-                break;
-            case CornerWidget:
-                if (!isLeftToRight())
-                    targetWidget = abstractScrollArea()->horizontalScrollBar();
-                break;
-            default:
-                break;
-            }
-            break;
-        case QAccessible::Up:
-            if (entry < 1)
-                break;
-            switch (entryElement) {
-            case HorizontalContainer:
-                targetWidget = abstractScrollArea()->viewport();
-                break;
-            case CornerWidget:
-                targetWidget = abstractScrollArea()->verticalScrollBar();
-                break;
-            default:
-                break;
-            }
-            break;
-        case QAccessible::Down:
-            if (entry < 1)
-                break;
-            switch (entryElement) {
-            case Viewport:
-                targetWidget = abstractScrollArea()->horizontalScrollBar();
-                break;
-            case VerticalContainer:
-                targetWidget = abstractScrollArea()->cornerWidget();
-                break;
-            default:
-                break;
-            }
-            break;
-        default:
-            break;
-        }
-    } else {
-        return QAccessibleWidget::navigate(relation, entry, target);
-    }
-
-    if (qobject_cast<const QScrollBar *>(targetWidget))
-        targetWidget = targetWidget->parentWidget();
-    *target = QAccessible::queryAccessibleInterface(targetWidget);
-    return *target ? 0: -1;
-}
-
 QAccessibleInterface *QAccessibleAbstractScrollArea::childAt(int x, int y) const
 {
     if (!abstractScrollArea()->isVisible())
-- 
cgit v1.2.3