Remove virtual child integers.

This makes the accessibility apis much
simpler and less error prone.

Disable the itemviews implementation that is in complex widgets.
The itemviews will use the new code from itemviews.h/cpp everywhere now.

QToolBox was broken before, now at least it simply exposes all its children.
The children are the buttons (tabs of the toolbox) and their contents.

Change-Id: I45e218f49f02aebbd678ddfe29f94c2a112a2125
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>

3 files changed, 1 insertions, 27 deletions

diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index ee20d8880b..44ae7246c4 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -3169,11 +3169,7 @@ void QListView::currentChanged(const QModelIndex &current, const QModelIndex &pr
     if (QAccessible::isActive()) {
         if (current.isValid()) {
             int entry = visualIndex(current) + 1;
-#ifdef Q_OS_UNIX
             QAccessible::updateAccessibility(this, entry, QAccessible::Focus);
-#else
-            QAccessible::updateAccessibility(viewport(), entry, QAccessible::Focus);
-#endif
         }
     }
 #endif
@@ -3192,20 +3188,12 @@ void QListView::selectionChanged(const QItemSelection &selected,
         QModelIndex sel = selected.indexes().value(0);
         if (sel.isValid()) {
             int entry = visualIndex(sel) + 1;
-#ifdef Q_OS_UNIX
             QAccessible::updateAccessibility(this, entry, QAccessible::Selection);
-#else
-            QAccessible::updateAccessibility(viewport(), entry, QAccessible::Selection);
-#endif
         }
         QModelIndex desel = deselected.indexes().value(0);
         if (desel.isValid()) {
             int entry = visualIndex(desel) + 1;
-#ifdef Q_OS_UNIX
             QAccessible::updateAccessibility(this, entry, QAccessible::SelectionRemove);
-#else
-            QAccessible::updateAccessibility(viewport(), entry, QAccessible::SelectionRemove);
-#endif
         }
     }
 #endif
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index 25cb29ffd2..5674162b05 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -3749,29 +3749,15 @@ void QTreeView::selectionChanged(const QItemSelection &selected,
         // ### does not work properly for selection ranges.
         QModelIndex sel = selected.indexes().value(0);
         if (sel.isValid()) {
-#ifdef Q_OS_UNIX
             int entry = (visualIndex(sel) + (header()?1:0))*sel.model()->columnCount()+sel.column() + 1;
             Q_ASSERT(entry > 0);
             QAccessible::updateAccessibility(this, entry, QAccessible::Selection);
-#else
-            int entry = visualIndex(sel) + 1;
-            if (header())
-                ++entry;
-            QAccessible::updateAccessibility(viewport(), entry, QAccessible::Selection);
-#endif
         }
         QModelIndex desel = deselected.indexes().value(0);
         if (desel.isValid()) {
-#ifdef Q_OS_UNIX
             int entry = (visualIndex(desel) + (header()?1:0))*desel.model()->columnCount()+desel.column() + 1;
             Q_ASSERT(entry > 0);
             QAccessible::updateAccessibility(this, entry, QAccessible::SelectionRemove);
-#else
-            int entry = visualIndex(desel) + 1;
-            if (header())
-                ++entry;
-            QAccessible::updateAccessibility(viewport(), entry, QAccessible::SelectionRemove);
-#endif
         }
     }
 #endif
diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h
index 47cac2faed..bf8d016e31 100644
--- a/src/widgets/itemviews/qtreeview.h
+++ b/src/widgets/itemviews/qtreeview.h
@@ -218,7 +218,7 @@ protected:
     void currentChanged(const QModelIndex &current, const QModelIndex &previous);
 
 private:
-    friend class QAccessibleItemView;
+    //friend class QAccessibleItemView;
     friend class QAccessibleTable2;
     friend class QAccessibleTree;
     friend class QAccessibleTable2Cell;