1 files changed, 16 insertions, 7 deletions
diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp
index 4f6cb56060..23a459c7e6 100644
--- a/src/widgets/accessible/itemviews.cpp
+++ b/src/widgets/accessible/itemviews.cpp
@@ -94,7 +94,7 @@ bool QAccessibleTable::isValid() const
 
 QAccessibleTable::~QAccessibleTable()
 {
-    Q_FOREACH (QAccessible::Id id, childToId.values())
+    Q_FOREACH (QAccessible::Id id, childToId)
         QAccessible::deleteAccessibleInterface(id);
 }
 
@@ -198,7 +198,9 @@ QList<QAccessibleInterface *> QAccessibleTable::selectedCells() const
     QList<QAccessibleInterface*> cells;
     if (!view()->selectionModel())
         return cells;
-    Q_FOREACH (const QModelIndex &index, view()->selectionModel()->selectedIndexes())
+    const QModelIndexList selectedIndexes = view()->selectionModel()->selectedIndexes();
+    cells.reserve(selectedIndexes.size());
+    Q_FOREACH (const QModelIndex &index, selectedIndexes)
         cells.append(child(logicalIndex(index)));
     return cells;
 }
@@ -208,9 +210,11 @@ QList<int> QAccessibleTable::selectedColumns() const
     if (!view()->selectionModel())
         return QList<int>();
     QList<int> columns;
-    Q_FOREACH (const QModelIndex &index, view()->selectionModel()->selectedColumns()) {
+    const QModelIndexList selectedColumns = view()->selectionModel()->selectedColumns();
+    columns.reserve(selectedColumns.size());
+    Q_FOREACH (const QModelIndex &index, selectedColumns)
         columns.append(index.column());
-    }
+
     return columns;
 }
 
@@ -219,9 +223,11 @@ QList<int> QAccessibleTable::selectedRows() const
     if (!view()->selectionModel())
         return QList<int>();
     QList<int> rows;
-    Q_FOREACH (const QModelIndex &index, view()->selectionModel()->selectedRows()) {
+    const QModelIndexList selectedRows = view()->selectionModel()->selectedRows();
+    rows.reserve(selectedRows.size());
+    Q_FOREACH (const QModelIndex &index, selectedRows)
         rows.append(index.row());
-    }
+
     return rows;
 }
 
@@ -526,7 +532,7 @@ void QAccessibleTable::modelChange(QAccessibleTableModelChangeEvent *event)
 
     switch (event->modelChangeType()) {
     case QAccessibleTableModelChangeEvent::ModelReset:
-        Q_FOREACH (QAccessible::Id id, childToId.values())
+        Q_FOREACH (QAccessible::Id id, childToId)
             QAccessible::deleteAccessibleInterface(id);
         childToId.clear();
         break;
@@ -1010,6 +1016,9 @@ QAccessible::Role QAccessibleTableCell::role() const
 QAccessible::State QAccessibleTableCell::state() const
 {
     QAccessible::State st;
+    if (!view)
+        return st;
+
     QRect globalRect = view->rect();
     globalRect.translate(view->mapToGlobal(QPoint(0,0)));
     if (!globalRect.intersects(rect()))