X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/8679115552ec65ccfc6cbc1db68414d80e3a081b..385146a1e8bd6762af9945756cc27e5a46b4f98a:/src/kitemviews/kitemlistviewaccessible.cpp diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp index 7b1605a0c..a75df8b76 100644 --- a/src/kitemviews/kitemlistviewaccessible.cpp +++ b/src/kitemviews/kitemlistviewaccessible.cpp @@ -1,24 +1,10 @@ -/*************************************************************************** - * Copyright (C) 2012 by Amandeep Singh * - * * - * 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 * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2012 Amandeep Singh + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #ifndef QT_NO_ACCESSIBILITY - #include "kitemlistviewaccessible.h" #include "kitemlistcontainer.h" @@ -27,19 +13,16 @@ #include "kitemlistview.h" #include "private/kitemlistviewlayouter.h" -#include -#include -#include - -#include +#include +#include -KItemListView* KItemListViewAccessible::view() const +KItemListView *KItemListViewAccessible::view() const { - return qobject_cast(object()); + return qobject_cast(object()); } -KItemListViewAccessible::KItemListViewAccessible(KItemListView* view_) : - QAccessibleObject(view_) +KItemListViewAccessible::KItemListViewAccessible(KItemListView *view_) + : QAccessibleObject(view_) { Q_ASSERT(view()); m_cells.resize(childCount()); @@ -47,51 +30,53 @@ KItemListViewAccessible::KItemListViewAccessible(KItemListView* view_) : KItemListViewAccessible::~KItemListViewAccessible() { - foreach (QAccessibleInterface* child, m_cells) { - if (child) { - QAccessible::Id childId = QAccessible::uniqueId(child); - QAccessible::deleteAccessibleInterface(childId); + for (AccessibleIdWrapper idWrapper : qAsConst(m_cells)) { + 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) { - return static_cast(this); + return static_cast(this); } - return Q_NULLPTR; + return nullptr; } void KItemListViewAccessible::modelReset() { } -QAccessibleInterface* KItemListViewAccessible::cell(int index) const +QAccessibleInterface *KItemListViewAccessible::cell(int index) const { if (index < 0 || index >= view()->model()->count()) { - return 0; + return nullptr; } - 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) { - child = new KItemListAccessibleCell(view(), index); - QAccessible::registerAccessibleInterface(child); + AccessibleIdWrapper idWrapper = m_cells.at(index); + if (!idWrapper.isValid) { + idWrapper.id = QAccessible::registerAccessibleInterface(new KItemListAccessibleCell(view(), index)); + idWrapper.isValid = true; + m_cells.insert(index, idWrapper); } - return child; + 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); } -QAccessibleInterface* KItemListViewAccessible::caption() const +QAccessibleInterface *KItemListViewAccessible::caption() const { - return 0; + return nullptr; } QString KItemListViewAccessible::columnDescription(int) const @@ -143,10 +128,12 @@ QString KItemListViewAccessible::rowDescription(int) const return QString(); } -QList KItemListViewAccessible::selectedCells() const +QList KItemListViewAccessible::selectedCells() const { - QList cells; - Q_FOREACH (int index, view()->controller()->selectionManager()->selectedItems()) { + QList cells; + const auto items = view()->controller()->selectionManager()->selectedItems(); + cells.reserve(items.count()); + for (int index : items) { cells.append(cell(index)); } return cells; @@ -162,9 +149,9 @@ QList KItemListViewAccessible::selectedRows() const return QList(); } -QAccessibleInterface* KItemListViewAccessible::summary() const +QAccessibleInterface *KItemListViewAccessible::summary() const { - return 0; + return nullptr; } bool KItemListViewAccessible::isColumnSelected(int) const @@ -197,8 +184,9 @@ bool KItemListViewAccessible::unselectColumn(int) return true; } -void KItemListViewAccessible::modelChange(QAccessibleTableModelChangeEvent* /*event*/) -{} +void KItemListViewAccessible::modelChange(QAccessibleTableModelChangeEvent * /*event*/) +{ +} QAccessible::Role KItemListViewAccessible::role() const { @@ -211,17 +199,17 @@ QAccessible::State KItemListViewAccessible::state() const return s; } -QAccessibleInterface* KItemListViewAccessible::childAt(int x, int y) const +QAccessibleInterface *KItemListViewAccessible::childAt(int x, int y) const { const QPointF point = QPointF(x, y); - int itemIndex = view()->itemAt(view()->mapFromScene(point)); - return child(itemIndex); + const std::optional 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 Q_NULLPTR; + return nullptr; } int KItemListViewAccessible::childCount() const @@ -229,9 +217,9 @@ int KItemListViewAccessible::childCount() const return view()->model()->count(); } -int KItemListViewAccessible::indexOfChild(const QAccessibleInterface* interface) const +int KItemListViewAccessible::indexOfChild(const QAccessibleInterface *interface) const { - const KItemListAccessibleCell* widget = static_cast(interface); + const KItemListAccessibleCell *widget = static_cast(interface); return widget->index(); } @@ -246,9 +234,9 @@ QRect KItemListViewAccessible::rect() const return QRect(); } - const QGraphicsScene* scene = view()->scene(); + 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 { @@ -256,29 +244,35 @@ QRect KItemListViewAccessible::rect() const } } -QAccessibleInterface* KItemListViewAccessible::child(int index) const +QAccessibleInterface *KItemListViewAccessible::child(int index) const { if (index >= 0 && index < childCount()) { return cell(index); } - return Q_NULLPTR; + return nullptr; +} + +KItemListViewAccessible::AccessibleIdWrapper::AccessibleIdWrapper() + : isValid(false) + , id(0) +{ } // 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()); } -void* KItemListAccessibleCell::interface_cast(QAccessible::InterfaceType type) +void *KItemListAccessibleCell::interface_cast(QAccessible::InterfaceType type) { if (type == QAccessible::TableCellInterface) { - return static_cast(this); + return static_cast(this); } - return Q_NULLPTR; + return nullptr; } int KItemListAccessibleCell::columnExtent() const @@ -291,14 +285,14 @@ int KItemListAccessibleCell::rowExtent() const return 1; } -QList KItemListAccessibleCell::rowHeaderCells() const +QList KItemListAccessibleCell::rowHeaderCells() const { - return QList(); + return QList(); } -QList KItemListAccessibleCell::columnHeaderCells() const +QList KItemListAccessibleCell::columnHeaderCells() const { - return QList(); + return QList(); } int KItemListAccessibleCell::columnIndex() const @@ -316,7 +310,7 @@ bool KItemListAccessibleCell::isSelected() const return m_view->controller()->selectionManager()->isSelected(m_index); } -QAccessibleInterface* KItemListAccessibleCell::table() const +QAccessibleInterface *KItemListAccessibleCell::table() const { return QAccessible::queryAccessibleInterface(m_view); } @@ -388,13 +382,13 @@ QString KItemListAccessibleCell::text(QAccessible::Text t) const 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 Q_NULLPTR; + return nullptr; } bool KItemListAccessibleCell::isValid() const @@ -402,9 +396,9 @@ bool KItemListAccessibleCell::isValid() const 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 Q_NULLPTR; + return nullptr; } int KItemListAccessibleCell::childCount() const @@ -412,13 +406,13 @@ int KItemListAccessibleCell::childCount() const return 0; } -int KItemListAccessibleCell::indexOfChild(const QAccessibleInterface* child) const +int KItemListAccessibleCell::indexOfChild(const QAccessibleInterface *child) const { - Q_UNUSED(child); + Q_UNUSED(child) return -1; } -QAccessibleInterface* KItemListAccessibleCell::parent() const +QAccessibleInterface *KItemListAccessibleCell::parent() const { return QAccessible::queryAccessibleInterface(m_view); } @@ -428,14 +422,14 @@ int KItemListAccessibleCell::index() const return m_index; } -QObject* KItemListAccessibleCell::object() const +QObject *KItemListAccessibleCell::object() const { - return 0; + return nullptr; } // Container Interface -KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer* container) : - QAccessibleWidget(container) +KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer *container) + : QAccessibleWidget(container) { } @@ -448,7 +442,7 @@ int KItemListContainerAccessible::childCount() const return 1; } -int KItemListContainerAccessible::indexOfChild(const QAccessibleInterface* child) const +int KItemListContainerAccessible::indexOfChild(const QAccessibleInterface *child) const { if (child->object() == container()->controller()->view()) { return 0; @@ -456,17 +450,17 @@ int KItemListContainerAccessible::indexOfChild(const QAccessibleInterface* child return -1; } -QAccessibleInterface* KItemListContainerAccessible::child(int index) const +QAccessibleInterface *KItemListContainerAccessible::child(int index) const { if (index == 0) { return QAccessible::queryAccessibleInterface(container()->controller()->view()); } - return Q_NULLPTR; + return nullptr; } -const KItemListContainer* KItemListContainerAccessible::container() const +const KItemListContainer *KItemListContainerAccessible::container() const { - return qobject_cast(object()); + return qobject_cast(object()); } #endif // QT_NO_ACCESSIBILITY