Remove QAccessibleInterface::navigate()

Hierarchical navigation has been moved to parent() and child(),
relationships have been moved to relations()

Change-Id: I4313eb3a6ed8b4812a347bb27b4d62f4f62ee9d5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>

diff --git a/src/plugins/accessible/quick/qaccessiblequickitem.cpp b/src/plugins/accessible/quick/qaccessiblequickitem.cpp
index 6e88886..806a0f5 100644 (file)
--- a/src/plugins/accessible/quick/qaccessiblequickitem.cpp
+++ b/src/plugins/accessible/quick/qaccessiblequickitem.cpp
@@ -118,15 +118,6 @@ QAccessibleInterface *QAccessibleQuickItem::child(int index) const
     return QAccessible::queryAccessibleInterface(child);
 }
 
-int QAccessibleQuickItem::navigate(QAccessible::RelationFlag rel, int entry, QAccessibleInterface **target) const
-{
-    Q_UNUSED(rel);
-    Q_UNUSED(entry);
-    Q_UNUSED(target);
-    *target = 0;
-    return -1;
-}
-
 int QAccessibleQuickItem::indexOfChild(const QAccessibleInterface *iface) const
 {
     QList<QQuickItem*> kids = childItems();

diff --git a/src/plugins/accessible/quick/qaccessiblequickitem.h b/src/plugins/accessible/quick/qaccessiblequickitem.h
index c67573d..a283f85 100644 (file)
--- a/src/plugins/accessible/quick/qaccessiblequickitem.h
+++ b/src/plugins/accessible/quick/qaccessiblequickitem.h
@@ -63,7 +63,6 @@ public:
     QAccessibleInterface *parent() const;
     QAccessibleInterface *child(int index) const;
     int childCount() const;
-    int navigate(QAccessible::RelationFlag rel, int entry, QAccessibleInterface **target) const;
     int indexOfChild(const QAccessibleInterface *iface) const;
     QList<QQuickItem *> childItems() const;
 

diff --git a/src/plugins/accessible/quick/qaccessiblequickview.cpp b/src/plugins/accessible/quick/qaccessiblequickview.cpp
index 802a947..05f0b8e 100644 (file)
--- a/src/plugins/accessible/quick/qaccessiblequickview.cpp
+++ b/src/plugins/accessible/quick/qaccessiblequickview.cpp
@@ -91,14 +91,6 @@ QRect QAccessibleQuickView::rect() const
     return QRect(view()->x(), view()->y(), view()->width(), view()->height());
 }
 
-int QAccessibleQuickView::navigate(QAccessible::RelationFlag rel, int entry, QAccessibleInterface **target) const
-{
-    Q_UNUSED(rel);
-    Q_UNUSED(entry);
-    Q_UNUSED(target);
-    return -1;
-}
-
 QString QAccessibleQuickView::text(QAccessible::Text text) const
 {
 #ifdef Q_ACCESSIBLE_QUICK_ITEM_ENABLE_DEBUG_DESCRIPTION

diff --git a/src/plugins/accessible/quick/qaccessiblequickview.h b/src/plugins/accessible/quick/qaccessiblequickview.h
index d72c1b7..66c8a52 100644 (file)
--- a/src/plugins/accessible/quick/qaccessiblequickview.h
+++ b/src/plugins/accessible/quick/qaccessiblequickview.h
@@ -63,7 +63,6 @@ public:
     QRect rect() const;
 
     int childCount() const;
-    int navigate(QAccessible::RelationFlag rel, int entry, QAccessibleInterface **target) const;
     int indexOfChild(const QAccessibleInterface *iface) const;
     QString text(QAccessible::Text text) const;
     QAccessibleInterface *childAt(int x, int y) const;