1 files changed, 4 insertions, 67 deletions

diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp
index 7e3dfbd68db..cc3a230f9b4 100644
--- a/src/widgets/accessible/itemviews.cpp
+++ b/src/widgets/accessible/itemviews.cpp
@@ -44,7 +44,7 @@ int QAccessibleTable::logicalIndex(const QModelIndex &index) const
         return -1;
 
 #if QT_CONFIG(listview)
-    if (m_role == QAccessible::List) {
+    if (role() == QAccessible::List) {
         if (index.column() != qobject_cast<const QListView*>(view())->modelColumn())
             return -1;
         else
@@ -59,35 +59,10 @@ int QAccessibleTable::logicalIndex(const QModelIndex &index) const
     }
 }
 
-QAccessibleTable::QAccessibleTable(QWidget *w)
-    : QAccessibleWidgetV2(w)
+QAccessibleTable::QAccessibleTable(QWidget *w, QAccessible::Role role)
+    : QAccessibleWidgetV2(w, role)
 {
     Q_ASSERT(view());
-
-#if QT_CONFIG(tableview)
-    if (qobject_cast<const QTableView*>(view())) {
-        m_role = QAccessible::Table;
-    } else
-#endif
-#if QT_CONFIG(treeview)
-    if (qobject_cast<const QTreeView*>(view())) {
-        m_role = QAccessible::Tree;
-    } else
-#endif
-#if QT_CONFIG(listview)
-    if (qobject_cast<const QListView*>(view())) {
-        m_role = QAccessible::List;
-    } else
-#endif
-    {
-        // is this our best guess?
-        m_role = QAccessible::Table;
-    }
-}
-
-bool QAccessibleTable::isValid() const
-{
-    return view() && !qt_widget_private(view())->data.in_destructor;
 }
 
 QAccessibleTable::~QAccessibleTable()
@@ -161,7 +136,7 @@ int QAccessibleTable::columnCount() const
     if (!theModel)
         return 0;
     const int modelColumnCount = theModel->columnCount(theView->rootIndex());
-    return m_role == QAccessible::List ? qMin(1, modelColumnCount) : modelColumnCount;
+    return role() == QAccessible::List ? qMin(1, modelColumnCount) : modelColumnCount;
 }
 
 int QAccessibleTable::rowCount() const
@@ -491,36 +466,6 @@ bool QAccessibleTable::clear()
 }
 
 
-QAccessible::Role QAccessibleTable::role() const
-{
-    return m_role;
-}
-
-QAccessible::State QAccessibleTable::state() const
-{
-    QAccessible::State state;
-    const auto *w = view();
-
-    if (w->testAttribute(Qt::WA_WState_Visible) == false)
-        state.invisible = true;
-    if (w->focusPolicy() != Qt::NoFocus)
-        state.focusable = true;
-    if (w->hasFocus())
-        state.focused = true;
-    if (!w->isEnabled())
-        state.disabled = true;
-    if (w->isWindow()) {
-        if (w->windowFlags() & Qt::WindowSystemMenuHint)
-            state.movable = true;
-        if (w->minimumSize() != w->maximumSize())
-            state.sizeable = true;
-        if (w->isActiveWindow())
-            state.active = true;
-    }
-
-    return state;
-}
-
 QAccessibleInterface *QAccessibleTable::childAt(int x, int y) const
 {
     QPoint viewportOffset = view()->viewport()->mapTo(view(), QPoint(0,0));
@@ -589,14 +534,6 @@ int QAccessibleTable::indexOfChild(const QAccessibleInterface *iface) const
     return -1;
 }
 
-QRect QAccessibleTable::rect() const
-{
-    if (!view()->isVisible())
-        return QRect();
-    QPoint pos = view()->mapToGlobal(QPoint(0, 0));
-    return QRect(pos.x(), pos.y(), view()->width(), view()->height());
-}
-
 QAccessibleInterface *QAccessibleTable::parent() const
 {
     if (view() && view()->parent()) {