GIT_SILENT Sync po/docbooks with svn

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

diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index 5f37535255262b957aa8710750d7d73dcd0435d8..a8d80ab52baa039b63533f28b83ba62e35cc9610 100644 (file)
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -5,7 +5,6 @@
  */
 
 #ifndef QT_NO_ACCESSIBILITY
  */
 
 #ifndef QT_NO_ACCESSIBILITY

-

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


@@ -17,31 +16,33 @@
 #include <QGraphicsScene>
 #include <QGraphicsView>
 
 #include <QGraphicsScene>
 #include <QGraphicsView>
 

-KItemListView* KItemListViewAccessible::view() const
+KItemListView *KItemListViewAccessible::view() const

 {
 {

-    return qobject_cast<KItemListView*>(object());
+    return qobject_cast<KItemListView *>(object());

 }
 
 }
 

-KItemListViewAccessible::KItemListViewAccessible(KItemListView* view_) :
-    QAccessibleObject(view_)
+KItemListViewAccessible::KItemListViewAccessible(KItemListView *view_, KItemListContainerAccessible *parent)
+    : QAccessibleObject(view_)
+    , m_parent(parent)

 {
     Q_ASSERT(view());
 {
     Q_ASSERT(view());

+    Q_CHECK_PTR(parent);

     m_cells.resize(childCount());
 }
 
 KItemListViewAccessible::~KItemListViewAccessible()
 {
     m_cells.resize(childCount());
 }
 
 KItemListViewAccessible::~KItemListViewAccessible()
 {

-    foreach (AccessibleIdWrapper idWrapper, m_cells) {
+    for (AccessibleIdWrapper idWrapper : std::as_const(m_cells)) {

         if (idWrapper.isValid) {
             QAccessible::deleteAccessibleInterface(idWrapper.id);
         }
     }
 }
 
         if (idWrapper.isValid) {
             QAccessible::deleteAccessibleInterface(idWrapper.id);
         }
     }
 }
 

-void* KItemListViewAccessible::interface_cast(QAccessible::InterfaceType type)
+void *KItemListViewAccessible::interface_cast(QAccessible::InterfaceType type)

 {
     if (type == QAccessible::TableInterface) {
 {
     if (type == QAccessible::TableInterface) {

-        return static_cast<QAccessibleTableInterface*>(this);
+        return static_cast<QAccessibleTableInterface *>(this);

     }
     return nullptr;
 }
     }
     return nullptr;
 }


@@ -50,7 +51,7 @@ void KItemListViewAccessible::modelReset()
 {
 }
 
 {
 }
 

-QAccessibleInterface* KItemListViewAccessible::cell(int index) const
+QAccessibleInterface *KItemListViewAccessible::cell(int index) const

 {
     if (index < 0 || index >= view()->model()->count()) {
         return nullptr;
 {
     if (index < 0 || index >= view()->model()->count()) {
         return nullptr;


@@ -70,12 +71,12 @@ QAccessibleInterface* KItemListViewAccessible::cell(int index) const
     return QAccessible::accessibleInterface(idWrapper.id);
 }
 
     return QAccessible::accessibleInterface(idWrapper.id);
 }
 

-QAccessibleInterface* KItemListViewAccessible::cellAt(int row, int column) const
+QAccessibleInterface *KItemListViewAccessible::cellAt(int row, int column) const

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

-QAccessibleInterface* KItemListViewAccessible::caption() const
+QAccessibleInterface *KItemListViewAccessible::caption() const

 {
     return nullptr;
 }
 {
     return nullptr;
 }


@@ -129,9 +130,9 @@ QString KItemListViewAccessible::rowDescription(int) const
     return QString();
 }
 
     return QString();
 }
 

-QList<QAccessibleInterface*> KItemListViewAccessible::selectedCells() const
+QList<QAccessibleInterface *> KItemListViewAccessible::selectedCells() const

 {
 {

-    QList<QAccessibleInterface*> cells;
+    QList<QAccessibleInterface *> cells;

     const auto items = view()->controller()->selectionManager()->selectedItems();
     cells.reserve(items.count());
     for (int index : items) {
     const auto items = view()->controller()->selectionManager()->selectedItems();
     cells.reserve(items.count());
     for (int index : items) {


@@ -150,7 +151,7 @@ QList<int> KItemListViewAccessible::selectedRows() const
     return QList<int>();
 }
 
     return QList<int>();
 }
 

-QAccessibleInterface* KItemListViewAccessible::summary() const
+QAccessibleInterface *KItemListViewAccessible::summary() const

 {
     return nullptr;
 }
 {
     return nullptr;
 }


@@ -185,8 +186,9 @@ bool KItemListViewAccessible::unselectColumn(int)
     return true;
 }
 
     return true;
 }
 

-void KItemListViewAccessible::modelChange(QAccessibleTableModelChangeEvent* /*event*/)
-{}
+void KItemListViewAccessible::modelChange(QAccessibleTableModelChangeEvent * /*event*/)
+{
+}

 
 QAccessible::Role KItemListViewAccessible::role() const
 {
 
 QAccessible::Role KItemListViewAccessible::role() const
 {


@@ -199,17 +201,16 @@ QAccessible::State KItemListViewAccessible::state() const
     return s;
 }
 
     return s;
 }
 

-QAccessibleInterface* KItemListViewAccessible::childAt(int x, int y) const
+QAccessibleInterface *KItemListViewAccessible::childAt(int x, int y) const

 {
     const QPointF point = QPointF(x, y);
 {
     const QPointF point = QPointF(x, y);

-    int itemIndex = view()->itemAt(view()->mapFromScene(point));
-    return child(itemIndex);
+    const std::optional<int> itemIndex = view()->itemAt(view()->mapFromScene(point));
+    return child(itemIndex.value_or(-1));

 }
 
 }
 

-QAccessibleInterface* KItemListViewAccessible::parent() const
+QAccessibleInterface *KItemListViewAccessible::parent() const

 {
 {

-    // FIXME: return KItemListContainerAccessible here
-    return nullptr;
+    return m_parent;

 }
 
 int KItemListViewAccessible::childCount() const
 }
 
 int KItemListViewAccessible::childCount() const


@@ -217,9 +218,9 @@ int KItemListViewAccessible::childCount() const
     return view()->model()->count();
 }
 
     return view()->model()->count();
 }
 

-int KItemListViewAccessible::indexOfChild(const QAccessibleInterface* interface) const
+int KItemListViewAccessible::indexOfChild(const QAccessibleInterface *interface) const

 {
 {

-    const KItemListAccessibleCell* widget = static_cast<const KItemListAccessibleCell*>(interface);
+    const KItemListAccessibleCell *widget = static_cast<const KItemListAccessibleCell *>(interface);

     return widget->index();
 }
 
     return widget->index();
 }
 


@@ -234,7 +235,7 @@ QRect KItemListViewAccessible::rect() const
         return QRect();
     }
 
         return QRect();
     }
 

-    const QGraphicsScene* scene = view()->scene();
+    const QGraphicsScene *scene = view()->scene();

     if (scene) {
         const QPoint origin = scene->views().at(0)->mapToGlobal(QPoint(0, 0));
         const QRect viewRect = view()->geometry().toRect();
     if (scene) {
         const QPoint origin = scene->views().at(0)->mapToGlobal(QPoint(0, 0));
         const QRect viewRect = view()->geometry().toRect();


@@ -244,7 +245,7 @@ QRect KItemListViewAccessible::rect() const
     }
 }
 
     }
 }
 

-QAccessibleInterface* KItemListViewAccessible::child(int index) const
+QAccessibleInterface *KItemListViewAccessible::child(int index) const

 {
     if (index >= 0 && index < childCount()) {
         return cell(index);
 {
     if (index >= 0 && index < childCount()) {
         return cell(index);


@@ -252,25 +253,25 @@ QAccessibleInterface* KItemListViewAccessible::child(int index) const
     return nullptr;
 }
 
     return nullptr;
 }
 

-KItemListViewAccessible::AccessibleIdWrapper::AccessibleIdWrapper() :
-    isValid(false),
-    id(0)
+KItemListViewAccessible::AccessibleIdWrapper::AccessibleIdWrapper()
+    : isValid(false)
+    , id(0)

 {
 }
 
 // Table Cell
 
 {
 }
 
 // Table Cell
 

-KItemListAccessibleCell::KItemListAccessibleCell(KItemListView* view, int index) :
-    m_view(view),
-    m_index(index)
+KItemListAccessibleCell::KItemListAccessibleCell(KItemListView *view, int index)
+    : m_view(view)
+    , m_index(index)

 {
     Q_ASSERT(index >= 0 && index < view->model()->count());
 }
 
 {
     Q_ASSERT(index >= 0 && index < view->model()->count());
 }
 

-void* KItemListAccessibleCell::interface_cast(QAccessible::InterfaceType type)
+void *KItemListAccessibleCell::interface_cast(QAccessible::InterfaceType type)

 {
     if (type == QAccessible::TableCellInterface) {
 {
     if (type == QAccessible::TableCellInterface) {

-        return static_cast<QAccessibleTableCellInterface*>(this);
+        return static_cast<QAccessibleTableCellInterface *>(this);

     }
     return nullptr;
 }
     }
     return nullptr;
 }


@@ -285,14 +286,14 @@ int KItemListAccessibleCell::rowExtent() const
     return 1;
 }
 
     return 1;
 }
 

-QList<QAccessibleInterface*> KItemListAccessibleCell::rowHeaderCells() const
+QList<QAccessibleInterface *> KItemListAccessibleCell::rowHeaderCells() const

 {
 {

-    return QList<QAccessibleInterface*>();
+    return QList<QAccessibleInterface *>();

 }
 
 }
 

-QList<QAccessibleInterface*> KItemListAccessibleCell::columnHeaderCells() const
+QList<QAccessibleInterface *> KItemListAccessibleCell::columnHeaderCells() const

 {
 {

-    return QList<QAccessibleInterface*>();
+    return QList<QAccessibleInterface *>();

 }
 
 int KItemListAccessibleCell::columnIndex() const
 }
 
 int KItemListAccessibleCell::columnIndex() const


@@ -310,7 +311,7 @@ bool KItemListAccessibleCell::isSelected() const
     return m_view->controller()->selectionManager()->isSelected(m_index);
 }
 
     return m_view->controller()->selectionManager()->isSelected(m_index);
 }
 

-QAccessibleInterface* KItemListAccessibleCell::table() const
+QAccessibleInterface *KItemListAccessibleCell::table() const

 {
     return QAccessible::queryAccessibleInterface(m_view);
 }
 {
     return QAccessible::queryAccessibleInterface(m_view);
 }


@@ -382,11 +383,11 @@ QString KItemListAccessibleCell::text(QAccessible::Text t) const
     return QString();
 }
 
     return QString();
 }
 

-void KItemListAccessibleCell::setText(QAccessible::Text, const QString&)
+void KItemListAccessibleCell::setText(QAccessible::Text, const QString &)

 {
 }
 
 {
 }
 

-QAccessibleInterface* KItemListAccessibleCell::child(int) const
+QAccessibleInterface *KItemListAccessibleCell::child(int) const

 {
     return nullptr;
 }
 {
     return nullptr;
 }


@@ -396,7 +397,7 @@ bool KItemListAccessibleCell::isValid() const
     return m_view && (m_index >= 0) && (m_index < m_view->model()->count());
 }
 
     return m_view && (m_index >= 0) && (m_index < m_view->model()->count());
 }
 

-QAccessibleInterface* KItemListAccessibleCell::childAt(int, int) const
+QAccessibleInterface *KItemListAccessibleCell::childAt(int, int) const

 {
     return nullptr;
 }
 {
     return nullptr;
 }


@@ -406,13 +407,13 @@ int KItemListAccessibleCell::childCount() const
     return 0;
 }
 
     return 0;
 }
 

-int KItemListAccessibleCell::indexOfChild(const QAccessibleInterface* child) const
+int KItemListAccessibleCell::indexOfChild(const QAccessibleInterface *child) const

 {
     Q_UNUSED(child)
     return -1;
 }
 
 {
     Q_UNUSED(child)
     return -1;
 }
 

-QAccessibleInterface* KItemListAccessibleCell::parent() const
+QAccessibleInterface *KItemListAccessibleCell::parent() const

 {
     return QAccessible::queryAccessibleInterface(m_view);
 }
 {
     return QAccessible::queryAccessibleInterface(m_view);
 }


@@ -422,14 +423,14 @@ int KItemListAccessibleCell::index() const
     return m_index;
 }
 
     return m_index;
 }
 

-QObject* KItemListAccessibleCell::object() const
+QObject *KItemListAccessibleCell::object() const

 {
     return nullptr;
 }
 
 // Container Interface
 {
     return nullptr;
 }
 
 // Container Interface

-KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer* container) :
-    QAccessibleWidget(container)
+KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer *container)
+    : QAccessibleWidget(container)

 {
 }
 
 {
 }
 


@@ -442,7 +443,7 @@ int KItemListContainerAccessible::childCount() const
     return 1;
 }
 
     return 1;
 }
 

-int KItemListContainerAccessible::indexOfChild(const QAccessibleInterface* child) const
+int KItemListContainerAccessible::indexOfChild(const QAccessibleInterface *child) const

 {
     if (child->object() == container()->controller()->view()) {
         return 0;
 {
     if (child->object() == container()->controller()->view()) {
         return 0;


@@ -450,7 +451,7 @@ int KItemListContainerAccessible::indexOfChild(const QAccessibleInterface* child
     return -1;
 }
 
     return -1;
 }
 

-QAccessibleInterface* KItemListContainerAccessible::child(int index) const
+QAccessibleInterface *KItemListContainerAccessible::child(int index) const

 {
     if (index == 0) {
         return QAccessible::queryAccessibleInterface(container()->controller()->view());
 {
     if (index == 0) {
         return QAccessible::queryAccessibleInterface(container()->controller()->view());


@@ -458,9 +459,9 @@ QAccessibleInterface* KItemListContainerAccessible::child(int index) const
     return nullptr;
 }
 
     return nullptr;
 }
 

-const KItemListContainer* KItemListContainerAccessible::container() const
+const KItemListContainer *KItemListContainerAccessible::container() const

 {
 {

-    return qobject_cast<KItemListContainer*>(object());
+    return qobject_cast<KItemListContainer *>(object());

 }
 
 #endif // QT_NO_ACCESSIBILITY
 }
 
 #endif // QT_NO_ACCESSIBILITY