Merge branch 'master' into frameworks

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

diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index c46e169fc8875adaa6089532c92ddd8d88fee045..d9ddd58f84045b9831b56ee74a601013250220b4 100644 (file)
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -1,3 +1,24 @@
+/***************************************************************************
+ *   Copyright (C) 2012 by Amandeep Singh <aman.dedman@gmail.com>          *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
+ ***************************************************************************/
+
+#ifndef QT_NO_ACCESSIBILITY
+

 #include "kitemlistviewaccessible.h"
 
 #include "kitemlistcontainer.h"
 #include "kitemlistviewaccessible.h"
 
 #include "kitemlistcontainer.h"


@@ -13,8 +34,6 @@
 #include <KDebug>
 #include <QHash>
 
 #include <KDebug>
 #include <QHash>
 

-#ifndef QT_NO_ACCESSIBILITY
-

 KItemListView* KItemListViewAccessible::view() const
 {
     return qobject_cast<KItemListView*>(object());
 KItemListView* KItemListViewAccessible::view() const
 {
     return qobject_cast<KItemListView*>(object());


@@ -51,7 +70,6 @@ QVariant KItemListViewAccessible::invokeMethodEx(Method, int, const QVariantList
 
 QAccessibleTable2CellInterface* KItemListViewAccessible::cellAt(int row, int column) const
 {
 
 QAccessibleTable2CellInterface* KItemListViewAccessible::cellAt(int row, int column) const
 {

-    kDebug() << "cellAt: " << row << column << " is: " << column*row + column;

     return cell(columnCount() * row + column);
 }
 
     return cell(columnCount() * row + column);
 }
 


@@ -91,7 +109,7 @@ int KItemListViewAccessible::rowCount() const
 
 int KItemListViewAccessible::selectedCellCount() const
 {
 
 int KItemListViewAccessible::selectedCellCount() const
 {

-    return view()->controller()->selectionManager()->selectedItems().size();
+    return view()->controller()->selectionManager()->selectedItems().count();

 }
 
 int KItemListViewAccessible::selectedColumnCount() const
 }
 
 int KItemListViewAccessible::selectedColumnCount() const


@@ -224,9 +242,15 @@ QRect KItemListViewAccessible::rect(int child) const
     if (!view()->isVisible()) {
         return QRect();
     }
     if (!view()->isVisible()) {
         return QRect();
     }

-    const QPoint origin = view()->scene()->views()[0]->mapToGlobal(QPoint(0, 0));
-    const QRect viewRect = view()->geometry().toRect();
-    return viewRect.translated(origin);
+
+    const QGraphicsScene* scene = view()->scene();
+    if (scene) {
+        const QPoint origin = scene->views()[0]->mapToGlobal(QPoint(0, 0));
+        const QRect viewRect = view()->geometry().toRect();
+        return viewRect.translated(origin);
+    } else {
+        return QRect();
+    }

 }
 
 int KItemListViewAccessible::navigate(RelationFlag relation, int index, QAccessibleInterface** interface) const
 }
 
 int KItemListViewAccessible::navigate(RelationFlag relation, int index, QAccessibleInterface** interface) const


@@ -344,7 +368,7 @@ QAccessible::State KItemListAccessibleCell::state(int child) const
     QAccessible::State state = Normal;
 
     if (isSelected()) {
     QAccessible::State state = Normal;
 
     if (isSelected()) {

-         state |= Selected;
+        state |= Selected;

     }
 
     if (m_view->controller()->selectionManager()->currentItem() == m_index) {
     }
 
     if (m_view->controller()->selectionManager()->currentItem() == m_index) {