Merge branch 'Applications/16.04'

[dolphin.git] / src / kitemviews / kitemlistviewaccessible.cpp

diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index 6345aaf50eed485bd41e41eb05f3943954c11e65..6f06e243e3ef0ac77360f806bcb57c763e6f9a07 100644 (file)
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -27,11 +27,10 @@
 #include "kitemlistview.h"
 #include "private/kitemlistviewlayouter.h"
 
-#include <QtGui/qaccessible.h>
+#include <qaccessible.h>
 #include <qgraphicsscene.h>
 #include <qgraphicsview.h>
 
-#include <QDebug>
 #include <QHash>
 
 KItemListView* KItemListViewAccessible::view() const
@@ -74,8 +73,10 @@ QAccessibleInterface* KItemListViewAccessible::cell(int index) const
         return 0;
     }
 
-    if (m_cells.size() < index - 1)
+    if (m_cells.size() <= index) {
         m_cells.resize(childCount());
+    }
+    Q_ASSERT(index < m_cells.size());
 
     QAccessibleInterface* child = m_cells.at(index);
     if (!child) {
@@ -147,7 +148,9 @@ QString KItemListViewAccessible::rowDescription(int) const
 QList<QAccessibleInterface*> KItemListViewAccessible::selectedCells() const
 {
     QList<QAccessibleInterface*> cells;
-    Q_FOREACH (int index, view()->controller()->selectionManager()->selectedItems()) {
+    const auto items = view()->controller()->selectionManager()->selectedItems();
+    cells.reserve(items.count());
+    for (int index : items) {
         cells.append(cell(index));
     }
     return cells;
@@ -249,7 +252,7 @@ QRect KItemListViewAccessible::rect() const
 
     const QGraphicsScene* scene = view()->scene();
     if (scene) {
-        const QPoint origin = scene->views()[0]->mapToGlobal(QPoint(0, 0));
+        const QPoint origin = scene->views().at(0)->mapToGlobal(QPoint(0, 0));
         const QRect viewRect = view()->geometry().toRect();
         return viewRect.translated(origin);
     } else {