From cd1d45c831458f96904c12b2803c3b8fc29f17f2 Mon Sep 17 00:00:00 2001 From: Amandeep Singh Date: Mon, 6 Aug 2012 17:40:30 +0530 Subject: Adding the Accessibility classes --- src/kitemviews/kitemlistview.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/kitemviews/kitemlistview.cpp') diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index 72b3fd8fc..11dad5209 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -43,6 +43,8 @@ #include #include +#include "kitemlistviewaccessible.h" + namespace { // Time in ms until reaching the autoscroll margin triggers // an initial autoscrolling @@ -52,6 +54,14 @@ namespace { const int RepeatingAutoScrollDelay = 1000 / 60; } +QAccessibleInterface* accessibleViewFactory(const QString &key, QObject *object) +{ + Q_UNUSED(key) + if (KItemListView *view = qobject_cast(object)) + return new KItemListViewAccessible(view); + return 0; +} + KItemListView::KItemListView(QGraphicsWidget* parent) : QGraphicsWidget(parent), m_enabledSelectionToggles(false), @@ -110,6 +120,8 @@ KItemListView::KItemListView(QGraphicsWidget* parent) : m_headerWidget->setVisible(false); m_header = new KItemListHeader(this); + + QAccessible::installFactory(accessibleViewFactory); } KItemListView::~KItemListView() @@ -125,6 +137,8 @@ KItemListView::~KItemListView() delete m_sizeHintResolver; m_sizeHintResolver = 0; + + QAccessible::removeFactory(accessibleViewFactory); } void KItemListView::setScrollOffset(qreal offset) -- cgit v1.3 From 6770e617cb8154ba0c8acd4229c4c0f9b8d65da9 Mon Sep 17 00:00:00 2001 From: Amandeep Singh Date: Fri, 10 Aug 2012 21:12:29 +0530 Subject: Enclose accessibility code within QT_NO_ACCESSIBILITY --- src/kitemviews/kitemlistcontainer.cpp | 5 ++++- src/kitemviews/kitemlistview.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src/kitemviews/kitemlistview.cpp') diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp index 56438d732..cc7c95391 100644 --- a/src/kitemviews/kitemlistcontainer.cpp +++ b/src/kitemviews/kitemlistcontainer.cpp @@ -107,7 +107,9 @@ KItemListContainer::KItemListContainer(KItemListController* controller, QWidget* connect(controller, SIGNAL(viewChanged(KItemListView*,KItemListView*)), this, SLOT(slotViewChanged(KItemListView*,KItemListView*))); +#ifndef QT_NO_ACCESSIBILITY QAccessible::installFactory(accessibleContainerFactory); +#endif } KItemListContainer::~KItemListContainer() @@ -116,8 +118,9 @@ KItemListContainer::~KItemListContainer() // the QGraphicsScene might get deleted before the view. delete m_controller; m_controller = 0; - +#ifndef QT_NO_ACCESSIBIILTY QAccessible::removeFactory(accessibleContainerFactory); +#endif } KItemListController* KItemListContainer::controller() const diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index 11dad5209..fe62e7a36 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -120,8 +120,9 @@ KItemListView::KItemListView(QGraphicsWidget* parent) : m_headerWidget->setVisible(false); m_header = new KItemListHeader(this); - +#ifndef QT_NO_ACCESSIBILITY QAccessible::installFactory(accessibleViewFactory); +#endif } KItemListView::~KItemListView() @@ -137,8 +138,9 @@ KItemListView::~KItemListView() delete m_sizeHintResolver; m_sizeHintResolver = 0; - +#ifndef QT_NO_ACCESSIBILITY QAccessible::removeFactory(accessibleViewFactory); +#endif } void KItemListView::setScrollOffset(qreal offset) -- cgit v1.3 From dc85bf39c929e69ebae62ab8b22b9214068e6721 Mon Sep 17 00:00:00 2001 From: Amandeep Singh Date: Mon, 13 Aug 2012 11:11:26 +0530 Subject: Remove unneccessary dependency and polish the Accessibility Interfaces --- src/kitemviews/kitemlistselectionmanager.cpp | 4 - src/kitemviews/kitemlistview.cpp | 1 + src/kitemviews/kitemlistviewaccessible.cpp | 171 +++++++-------------------- src/kitemviews/kitemlistviewaccessible.h | 45 +++---- 4 files changed, 60 insertions(+), 161 deletions(-) (limited to 'src/kitemviews/kitemlistview.cpp') diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp index dbeb00fc6..899a66f94 100644 --- a/src/kitemviews/kitemlistselectionmanager.cpp +++ b/src/kitemviews/kitemlistselectionmanager.cpp @@ -22,8 +22,6 @@ ***************************************************************************/ #include "kitemlistselectionmanager.h" -#include "kitemlistcontroller.h" -#include "kitemlistview.h" #include "kitemmodelbase.h" #include #include @@ -63,8 +61,6 @@ void KItemListSelectionManager::setCurrentItem(int current) } } } - KItemListController *controller = static_cast(parent()); - QAccessible::updateAccessibility(controller->view(), current+1, QAccessible::Focus); } int KItemListSelectionManager::currentItem() const diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index fe62e7a36..0689b0758 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -1267,6 +1267,7 @@ void KItemListView::slotCurrentChanged(int current, int previous) if (currentWidget) { currentWidget->setCurrent(true); } + QAccessible::updateAccessibility(this, current+1, QAccessible::Focus); } void KItemListView::slotSelectionChanged(const QSet& current, const QSet& previous) diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp index cb5097fad..980c31064 100644 --- a/src/kitemviews/kitemlistviewaccessible.cpp +++ b/src/kitemviews/kitemlistviewaccessible.cpp @@ -24,17 +24,6 @@ KItemListViewAccessible::KItemListViewAccessible(KItemListView *view_) : QAccessibleObjectEx(view_) { Q_ASSERT(view()); - - /*if (qobject_cast(view())) { - m_role = QAccessible::Table; - } else if (qobject_cast(view())) { - m_role = QAccessible::Tree; - } else if (qobject_cast(view())) { - m_role = QAccessible::List; - } else { - // is this our best guess? - m_role = QAccessible::Table; - }*/ } KItemListViewAccessible::~KItemListViewAccessible() @@ -46,21 +35,14 @@ void KItemListViewAccessible::modelReset() QAccessibleTable2CellInterface *KItemListViewAccessible::cell(int index) const { - if (index > 0) + if (index > 0) { return new KItemListAccessibleCell(view(), index); + } return 0; } QAccessibleTable2CellInterface *KItemListViewAccessible::cellAt(int row, int column) const { - /*Q_ASSERT(role(0) != QAccessible::Tree); - QModelIndex index = view()->model()->index(row, column); - //Q_ASSERT(index.isValid()); - if (!index.isValid()) { - qWarning() << "QAccessibleTable2::cellAt: invalid index: " << index << " for " << view(); - return 0; - } - return cell(index);*/ return cell(column * (row - 1) + column) ; } @@ -83,8 +65,9 @@ int KItemListViewAccessible::rowCount() const { int itemCount = view()->model()->count(); int rowCount = itemCount / columnCount(); - if (itemCount % rowCount) + if (itemCount % rowCount) { ++rowCount; + } return rowCount; } @@ -119,20 +102,12 @@ QList KItemListViewAccessible::selectedCells() QList KItemListViewAccessible::selectedColumns() const { - QList columns; - /*Q_FOREACH (const QModelIndex &index, view()->selectionModel()->selectedColumns()) { - columns.append(index.column()); - }*/ - return columns; + return QList(); } QList KItemListViewAccessible::selectedRows() const { - QList rows; - /*Q_FOREACH (const QModelIndex &index, view()->selectionModel()->selectedRows()) { - rows.append(index.row()); - }*/ - return rows; + return QList(); } QAccessibleInterface *KItemListViewAccessible::summary() const @@ -180,18 +155,20 @@ QAccessible2::TableModelChange KItemListViewAccessible::modelChange() const QAccessible::Role KItemListViewAccessible::role(int child) const { Q_ASSERT(child >= 0); - if (child > 0) + if (child > 0) { return QAccessible::Cell; + } return QAccessible::Table; } QAccessible::State KItemListViewAccessible::state(int child) const { - if(child){ + if (child) { QAccessibleInterface *iface; navigate(Child,child,&iface); - if(iface) + if (iface) { return iface->state(0); + } } return QAccessible::Normal | QAccessible::HasInvokeExtension; } @@ -209,25 +186,6 @@ int KItemListViewAccessible::childCount() const int KItemListViewAccessible::indexOfChild(const QAccessibleInterface *iface) const { - /*Q_ASSERT(iface->role(0) != QAccessible::TreeItem); // should be handled by tree class - if (iface->role(0) == QAccessible::Cell || iface->role(0) == QAccessible::ListItem) { - const QAccessibleTable2Cell* cell = static_cast(iface); - return logicalIndex(cell->m_index); - } else if (iface->role(0) == QAccessible::ColumnHeader){ - const QAccessibleTable2HeaderCell* cell = static_cast(iface); - return cell->index + (verticalHeader() ? 1 : 0) + 1; - } else if (iface->role(0) == QAccessible::RowHeader){ - const QAccessibleTable2HeaderCell* cell = static_cast(iface); - return (cell->index+1) * (view()->model()->rowCount()+1) + 1; - } else if (iface->role(0) == QAccessible::Pane) { - return 1; // corner button - } else { - qWarning() << "WARNING QAccessibleTable2::indexOfChild Fix my children..." - << iface->role(0) << iface->text(QAccessible::Name, 0); - } - // FIXME: we are in denial of our children. this should stop. - return -1;*/ - const KItemListAccessibleCell *widget = static_cast(iface); return widget->getIndex(); } @@ -235,17 +193,18 @@ int KItemListViewAccessible::indexOfChild(const QAccessibleInterface *iface) con QString KItemListViewAccessible::text(Text t, int child) const { Q_ASSERT(child == 0); - // FIXME: I don't think this is needed, but if at all it needs i18n - if (t == QAccessible::Description) + if (t == QAccessible::Description) { return QObject::tr("List of files present in the current directory"); + } return QObject::tr("File List"); } QRect KItemListViewAccessible::rect(int child) const { Q_UNUSED(child) - if (!view()->isVisible()) + if (!view()->isVisible()) { return QRect(); + } QPoint origin = view()->scene()->views()[0]->mapToGlobal(QPoint(0, 0)); QRect viewRect = view()->geometry().toRect(); return viewRect.translated(origin); @@ -255,24 +214,16 @@ int KItemListViewAccessible::navigate(RelationFlag relation, int index, QAccessi { *iface = 0; switch (relation) { - /*case Ancestor: { - if (index == 1 && view()->parent()) { - *iface = QAccessible::queryAccessibleInterface(view()->parent()); - if (*iface) + case QAccessible::Child: { + Q_ASSERT(index > 0); + *iface = cell(index); + if (*iface) { return 0; + } + break; } - break; - }*/ - case QAccessible::Child: { - Q_ASSERT(index > 0); - *iface = cell(index); - if (*iface) { - return 0; - } - break; - } - default: - break; + default: + break; } return -1; } @@ -300,7 +251,7 @@ bool KItemListViewAccessible::doAction(int, int, const QVariantList &) // TABLE CELL KItemListAccessibleCell::KItemListAccessibleCell(KItemListView *view_, int index_) - : /* QAccessibleSimpleEditableTextInterface(this), */ view(view_) + : view(view_) , index(index_) { Q_ASSERT(index_ > 0); @@ -318,20 +269,12 @@ int KItemListAccessibleCell::rowExtent() const QList KItemListAccessibleCell::rowHeaderCells() const { - QList headerCell; - /*if (verticalHeader()) { - headerCell.append(new QAccessibleTable2HeaderCell(view, m_index.row(), Qt::Vertical)); - }*/ - return headerCell; + return QList(); } QList KItemListAccessibleCell::columnHeaderCells() const { - QList headerCell; - /*if (horizontalHeader()) { - headerCell.append(new QAccessibleTable2HeaderCell(view, m_index.column(), Qt::Horizontal)); - }*/ - return headerCell; + return QList(); } int KItemListAccessibleCell::columnIndex() const @@ -341,12 +284,6 @@ int KItemListAccessibleCell::columnIndex() const int KItemListAccessibleCell::rowIndex() const { - /*if (role(0) == QAccessible::TreeItem) { - const QTreeView *treeView = qobject_cast(view); - Q_ASSERT(treeView); - int row = treeView->d_func()->viewIndex(m_index); - return row; - }*/ return view->layouter()->itemRow(index); } @@ -381,46 +318,34 @@ QAccessible::State KItemListAccessibleCell::state(int child) const Q_ASSERT(child == 0); QAccessible::State st = Normal; - //QRect globalRect = view->rect(); - //globalRect.translate(view->mapToGlobal(QPoint(0,0))); - //if (!globalRect.intersects(rect(0))) - // st |= Invisible; - - if (isSelected()) + if (isSelected()) { st |= Selected; - if (view->controller()->selectionManager()->currentItem() == index) + } + if (view->controller()->selectionManager()->currentItem() == index) { st |= Focused; + } - //if (m_index.model()->data(m_index, Qt::CheckStateRole).toInt() == Qt::Checked) - // st |= Checked; - //if (flags & Qt::ItemIsSelectable) { st |= Selectable; st |= Focusable; - if (view->controller()->selectionBehavior() == KItemListController::MultiSelection) - st |= MultiSelectable; - //if (view->selectionMode() == QAbstractItemView::ExtendedSelection) - //st |= ExtSelectable; - //} - //if (m_role == QAccessible::TreeItem) { - // const QTreeView *treeView = qobject_cast(view); - // if (treeView->isExpanded(m_index)) - // st |= Expanded; - //} + if (view->controller()->selectionBehavior() == KItemListController::MultiSelection){ + st |= MultiSelectable; + } return st; } bool KItemListAccessibleCell::isExpandable() const { - return false; //view->model()->hasChildren(m_index); + return false; } QRect KItemListAccessibleCell::rect(int) const { QRect r = view->itemRect(index-1).toRect(); - if (r.isNull()) + if (r.isNull()) { return QRect(); + } r.translate(view->mapToScene(QPointF(0.0, 0.0)).toPoint()); r.translate(view->scene()->views()[0]->mapToGlobal(QPoint(0, 0))); return r; @@ -435,8 +360,6 @@ QString KItemListAccessibleCell::text(QAccessible::Text t, int child) const case QAccessible::Value: case QAccessible::Name: return data["text"].toString(); - //case QAccessible::Description: - //return data["text"].toString() + " : " + data["group"].toString(); default: break; } @@ -457,16 +380,14 @@ bool KItemListAccessibleCell::isValid() const int KItemListAccessibleCell::navigate(RelationFlag relation, int index, QAccessibleInterface **iface) const { if (relation == Ancestor && index == 1) { - //if (m_role == QAccessible::TreeItem) { - // *iface = new QAccessibleTree(view); - //} else { *iface = new KItemListViewAccessible(view); return 0; } *iface = 0; - if (!view) + if (!view) { return -1; + } switch (relation) { @@ -478,8 +399,9 @@ int KItemListAccessibleCell::navigate(RelationFlag relation, int index, QAccessi QAccessibleInterface *parent = queryAccessibleInterface(view); int ret = parent->navigate(QAccessible::Child, index, iface); delete parent; - if (*iface) + if (*iface) { return ret; + } } return -1; default: @@ -493,16 +415,6 @@ QAccessible::Relation KItemListAccessibleCell::relationTo(int child, const QAcce { Q_ASSERT(child == 0); Q_ASSERT(otherChild == 0); - /* we only check for parent-child relationships in trees - if (m_role == QAccessible::TreeItem && other->role(0) == QAccessible::TreeItem) { - QModelIndex otherIndex = static_cast(other)->m_index; - // is the other our parent? - if (otherIndex.parent() == m_index) - return QAccessible::Ancestor; - // are we the other's child? - if (m_index.parent() == otherIndex) - return QAccessible::Child; - }*/ return QAccessible::Unrelated; } @@ -538,8 +450,9 @@ int KItemListContainerAccessible::childCount () const int KItemListContainerAccessible::indexOfChild ( const QAccessibleInterface * child ) const { - if(child->object() == container()->controller()->view()) + if (child->object() == container()->controller()->view()) { return 1; + } return -1; } diff --git a/src/kitemviews/kitemlistviewaccessible.h b/src/kitemviews/kitemlistviewaccessible.h index 105978c94..5fd22712c 100644 --- a/src/kitemviews/kitemlistviewaccessible.h +++ b/src/kitemviews/kitemlistviewaccessible.h @@ -84,28 +84,8 @@ protected: protected: inline QAccessibleTable2CellInterface *cell(int index) const; inline QAccessible::Role cellRole() const { - /* - switch (m_role) { - case QAccessible::List: - return QAccessible::ListItem; - case QAccessible::Table: - return QAccessible::Cell; - case QAccessible::Tree: - return QAccessible::TreeItem; - default: - Q_ASSERT(0); - } - return QAccessible::NoRole; - */ - return QAccessible::Cell; + return QAccessible::Cell; } - -private: - //QAccessible::Role m_role; - // the child index for a model index - //inline int logicalIndex(const QModelIndex &index) const; - // the model index from the child index - //QAccessibleInterface *childFromLogical(int logicalIndex) const; }; class KItemListAccessibleCell: public QAccessibleTable2CellInterface @@ -113,15 +93,24 @@ class KItemListAccessibleCell: public QAccessibleTable2CellInterface public: KItemListAccessibleCell(KItemListView *view, int m_index); - QObject *object() const { return 0; } + QObject *object() const + { + return 0; + } Role role(int) const; State state(int) const; QRect rect(int) const; bool isValid() const; - int childAt(int, int) const { return 0; } - int childCount() const { return 0; } - int indexOfChild(const QAccessibleInterface *) const { return -1; } + inline int childAt(int, int) const { + return 0; + } + inline int childCount() const { + return 0; + } + inline int indexOfChild(const QAccessibleInterface *) const { + return -1; + } QString text(Text t, int child) const; void setText(Text t, int child, const QString &text); @@ -148,15 +137,15 @@ public: virtual void rowColumnExtents(int *row, int *column, int *rowExtents, int *columnExtents, bool *selected) const; virtual QAccessibleTable2Interface* table() const; - inline int getIndex() const - { return index; } + inline int getIndex() const { + return index; + } private: QPointer view; int index; friend class KItemListViewAccessible; -//friend class QAccessibleTree; }; class KItemListContainerAccessible : public QAccessibleWidgetEx -- cgit v1.3 From 7ac839a234d89f130f9be31992b565ec0d71a960 Mon Sep 17 00:00:00 2001 From: Amandeep Singh Date: Mon, 13 Aug 2012 23:32:50 +0530 Subject: Reverting KListSelectionManager, removing unneccessary a11y factories --- src/kitemviews/kitemlistcontainer.cpp | 27 --------------------- src/kitemviews/kitemlistselectionmanager.cpp | 1 - src/kitemviews/kitemlistview.cpp | 10 ++++---- src/kitemviews/kitemlistviewaccessible.cpp | 35 +++++++++++++--------------- src/kitemviews/kitemlistviewaccessible.h | 12 +++------- 5 files changed, 25 insertions(+), 60 deletions(-) (limited to 'src/kitemviews/kitemlistview.cpp') diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp index cc7c95391..5500851c8 100644 --- a/src/kitemviews/kitemlistcontainer.cpp +++ b/src/kitemviews/kitemlistcontainer.cpp @@ -23,7 +23,6 @@ #include "kitemlistcontainer.h" #include "kitemlistcontroller.h" -#include "kitemlistselectionmanager.h" #include "kitemlistview.h" #include "kitemmodelbase.h" @@ -39,8 +38,6 @@ #include -#include "kitemlistviewaccessible.h" - /** * Replaces the default viewport of KItemListContainer by a * non-scrollable viewport. The scrolling is done in an optimized @@ -70,16 +67,6 @@ void KItemListContainerViewport::wheelEvent(QWheelEvent* event) event->ignore(); } -QAccessibleInterface* accessibleContainerFactory(const QString &key, QObject *object) -{ - Q_UNUSED(key) - if (KItemListContainer*view = qobject_cast(object)) - return new KItemListContainerAccessible(view); - if (KItemListView *view = qobject_cast(object)) - return new KItemListViewAccessible(view); - return 0; -} - KItemListContainer::KItemListContainer(KItemListController* controller, QWidget* parent) : QAbstractScrollArea(parent), m_controller(controller), @@ -106,10 +93,6 @@ KItemListContainer::KItemListContainer(KItemListController* controller, QWidget* this, SLOT(slotModelChanged(KItemModelBase*,KItemModelBase*))); connect(controller, SIGNAL(viewChanged(KItemListView*,KItemListView*)), this, SLOT(slotViewChanged(KItemListView*,KItemListView*))); - -#ifndef QT_NO_ACCESSIBILITY - QAccessible::installFactory(accessibleContainerFactory); -#endif } KItemListContainer::~KItemListContainer() @@ -118,9 +101,6 @@ KItemListContainer::~KItemListContainer() // the QGraphicsScene might get deleted before the view. delete m_controller; m_controller = 0; -#ifndef QT_NO_ACCESSIBIILTY - QAccessible::removeFactory(accessibleContainerFactory); -#endif } KItemListController* KItemListContainer::controller() const @@ -167,8 +147,6 @@ void KItemListContainer::keyPressEvent(QKeyEvent* event) if (view) { QApplication::sendEvent(view, event); } - QAccessible::updateAccessibility(view, m_controller->selectionManager()->currentItem()+1, QAccessible::Focus); - QAccessible::updateAccessibility(view, m_controller->selectionManager()->currentItem()+1, QAccessible::LocationChanged); } void KItemListContainer::showEvent(QShowEvent* event) @@ -187,8 +165,6 @@ void KItemListContainer::scrollContentsBy(int dx, int dy) { m_horizontalSmoothScroller->scrollContentsBy(dx); m_verticalSmoothScroller->scrollContentsBy(dy); - QAccessible::updateAccessibility(m_controller->view(), m_controller->selectionManager()->currentItem()+1, QAccessible::Focus); - QAccessible::updateAccessibility(m_controller->view(), m_controller->selectionManager()->currentItem()+1, QAccessible::LocationChanged); } void KItemListContainer::wheelEvent(QWheelEvent* event) @@ -376,9 +352,6 @@ void KItemListContainer::updateGeometries() updateScrollOffsetScrollBar(); updateItemOffsetScrollBar(); - QAccessible::updateAccessibility(m_controller->view(), 0, QAccessible::LocationChanged); - QAccessible::updateAccessibility(m_controller->view(), m_controller->selectionManager()->currentItem()+1, QAccessible::LocationChanged); - QAccessible::updateAccessibility(m_controller->view(), m_controller->selectionManager()->currentItem()+1, QAccessible::Focus); } } diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp index 899a66f94..d444bcffe 100644 --- a/src/kitemviews/kitemlistselectionmanager.cpp +++ b/src/kitemviews/kitemlistselectionmanager.cpp @@ -24,7 +24,6 @@ #include "kitemlistselectionmanager.h" #include "kitemmodelbase.h" #include -#include KItemListSelectionManager::KItemListSelectionManager(QObject* parent) : QObject(parent), diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index 0689b0758..48dab4b04 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -54,13 +54,16 @@ namespace { const int RepeatingAutoScrollDelay = 1000 / 60; } +#ifndef QT_NO_ACCESSIBILITY QAccessibleInterface* accessibleViewFactory(const QString &key, QObject *object) { Q_UNUSED(key) - if (KItemListView *view = qobject_cast(object)) + if (KItemListView *view = qobject_cast(object)) { return new KItemListViewAccessible(view); + } return 0; } +#endif KItemListView::KItemListView(QGraphicsWidget* parent) : QGraphicsWidget(parent), @@ -120,9 +123,11 @@ KItemListView::KItemListView(QGraphicsWidget* parent) : m_headerWidget->setVisible(false); m_header = new KItemListHeader(this); + #ifndef QT_NO_ACCESSIBILITY QAccessible::installFactory(accessibleViewFactory); #endif + } KItemListView::~KItemListView() @@ -138,9 +143,6 @@ KItemListView::~KItemListView() delete m_sizeHintResolver; m_sizeHintResolver = 0; -#ifndef QT_NO_ACCESSIBILITY - QAccessible::removeFactory(accessibleViewFactory); -#endif } void KItemListView::setScrollOffset(qreal offset) diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp index 980c31064..d0fd4f57a 100644 --- a/src/kitemviews/kitemlistviewaccessible.cpp +++ b/src/kitemviews/kitemlistviewaccessible.cpp @@ -2,6 +2,7 @@ #include "kitemlistcontroller.h" #include "kitemlistselectionmanager.h" #include "private/kitemlistviewlayouter.h" +#include #include #include @@ -13,8 +14,6 @@ #ifndef QT_NO_ACCESSIBILITY -#ifndef QT_NO_ITEMVIEWS - KItemListView *KItemListViewAccessible::view() const { return qobject_cast(object()); @@ -194,9 +193,9 @@ QString KItemListViewAccessible::text(Text t, int child) const { Q_ASSERT(child == 0); if (t == QAccessible::Description) { - return QObject::tr("List of files present in the current directory"); + return i18n("List of files present in the current directory"); } - return QObject::tr("File List"); + return i18n("File List"); } QRect KItemListViewAccessible::rect(int child) const @@ -250,11 +249,11 @@ bool KItemListViewAccessible::doAction(int, int, const QVariantList &) // TABLE CELL -KItemListAccessibleCell::KItemListAccessibleCell(KItemListView *view_, int index_) - : view(view_) - , index(index_) +KItemListAccessibleCell::KItemListAccessibleCell(KItemListView *view, int index) + : m_view(view) + , m_index(index) { - Q_ASSERT(index_ > 0); + Q_ASSERT(index > 0); } int KItemListAccessibleCell::columnExtent() const @@ -279,24 +278,24 @@ QList KItemListAccessibleCell::columnHeaderCells() const int KItemListAccessibleCell::columnIndex() const { - return view->layouter()->itemColumn(index); + return view->layouter()->itemColumn(m_index); } int KItemListAccessibleCell::rowIndex() const { - return view->layouter()->itemRow(index); + return view->layouter()->itemRow(m_index); } bool KItemListAccessibleCell::isSelected() const { - return view->controller()->selectionManager()->isSelected(index-1); + return view->controller()->selectionManager()->isSelected(m_index-1); } void KItemListAccessibleCell::rowColumnExtents(int *row, int *column, int *rowExtents, int *columnExtents, bool *selected) const { KItemListViewLayouter* layouter = view->layouter(); - *row = layouter->itemRow(index); - *column = layouter->itemColumn(index); + *row = layouter->itemRow(m_index); + *column = layouter->itemColumn(m_index); *rowExtents = 1; *columnExtents = 1; *selected = isSelected(); @@ -321,7 +320,7 @@ QAccessible::State KItemListAccessibleCell::state(int child) const if (isSelected()) { st |= Selected; } - if (view->controller()->selectionManager()->currentItem() == index) { + if (view->controller()->selectionManager()->currentItem() == m_index) { st |= Focused; } @@ -342,7 +341,7 @@ bool KItemListAccessibleCell::isExpandable() const QRect KItemListAccessibleCell::rect(int) const { - QRect r = view->itemRect(index-1).toRect(); + QRect r = view->itemRect(m_index-1).toRect(); if (r.isNull()) { return QRect(); } @@ -355,7 +354,7 @@ QString KItemListAccessibleCell::text(QAccessible::Text t, int child) const { Q_ASSERT(child == 0); Q_UNUSED(child) - const QHash data = view->model()->data(index-1); + const QHash data = view->model()->data(m_index-1); switch (t) { case QAccessible::Value: case QAccessible::Name: @@ -374,7 +373,7 @@ void KItemListAccessibleCell::setText(QAccessible::Text /*t*/, int child, const bool KItemListAccessibleCell::isValid() const { - return view && (index > 0); + return view && (m_index > 0); } int KItemListAccessibleCell::navigate(RelationFlag relation, int index, QAccessibleInterface **iface) const @@ -465,6 +464,4 @@ int KItemListContainerAccessible::navigate ( QAccessible::RelationFlag relation, return QAccessibleWidgetEx::navigate(relation, index, target); } -#endif // QT_NO_ITEMVIEWS - #endif // QT_NO_ACCESSIBILITY diff --git a/src/kitemviews/kitemlistviewaccessible.h b/src/kitemviews/kitemlistviewaccessible.h index 5fd22712c..a858005a4 100644 --- a/src/kitemviews/kitemlistviewaccessible.h +++ b/src/kitemviews/kitemlistviewaccessible.h @@ -2,8 +2,6 @@ #define ACCESSIBLE_ITEMVIEWS_H #include "QtCore/qpointer.h" -#include -#include #include #include #include @@ -13,8 +11,6 @@ #ifndef QT_NO_ACCESSIBILITY -#ifndef QT_NO_ITEMVIEWS - class KItemListAccessibleCell; class KItemListViewAccessible: public QAccessibleTable2Interface, public QAccessibleObjectEx @@ -137,13 +133,13 @@ public: virtual void rowColumnExtents(int *row, int *column, int *rowExtents, int *columnExtents, bool *selected) const; virtual QAccessibleTable2Interface* table() const; - inline int getIndex() const { + inline int index() const { return index; } private: - QPointer view; - int index; + QPointer m_view; + int m_index; friend class KItemListViewAccessible; }; @@ -165,8 +161,6 @@ private: } }; -#endif // QT_NO_ITEMVIEWS - #endif // QT_NO_ACCESSIBILITY #endif // ACCESSIBLE_ITEMVIEWS_H -- cgit v1.3 From 0ae031a4e6bdd702da573ac7ce048b6cf825e32e Mon Sep 17 00:00:00 2001 From: Amandeep Singh Date: Tue, 14 Aug 2012 22:52:21 +0530 Subject: Modify code according to dolphin policy --- src/CMakeLists.txt | 2 +- src/kitemviews/kitemlistview.cpp | 5 ++ src/kitemviews/kitemlistview.h | 5 +- src/kitemviews/kitemlistviewaccessible.cpp | 119 +++++++++++++++++++---------- src/kitemviews/kitemlistviewaccessible.h | 72 +++++++---------- 5 files changed, 113 insertions(+), 90 deletions(-) (limited to 'src/kitemviews/kitemlistview.cpp') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1a0460e87..624b30704 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,8 +34,8 @@ set(dolphinprivate_LIB_SRCS kitemviews/kitemmodelbase.cpp kitemviews/kstandarditem.cpp kitemviews/kstandarditemlistgroupheader.cpp - kitemviews/kstandarditemlistview.cpp kitemviews/kstandarditemlistwidget.cpp + kitemviews/kstandarditemlistview.cpp kitemviews/kstandarditemmodel.cpp kitemviews/private/kfileitemclipboard.cpp kitemviews/private/kfileitemmodeldirlister.cpp diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index 48dab4b04..07150a0d3 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -659,6 +659,11 @@ void KItemListView::paint(QPainter* painter, const QStyleOptionGraphicsItem* opt } } +KItemListViewLayouter* layouter() const +{ + return m_layouter; +} + void KItemListView::setItemSize(const QSizeF& size) { const QSizeF previousSize = m_itemSize; diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h index d4602d729..4460a36a5 100644 --- a/src/kitemviews/kitemlistview.h +++ b/src/kitemviews/kitemlistview.h @@ -278,10 +278,7 @@ public: /** * @return The Layouter for the view */ - inline KItemListViewLayouter *layouter() const - { - return m_layouter; - } + inline KItemListViewLayouter* layouter() const; signals: void scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous); diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp index 529506cb9..c0b64fcdc 100644 --- a/src/kitemviews/kitemlistviewaccessible.cpp +++ b/src/kitemviews/kitemlistviewaccessible.cpp @@ -3,7 +3,6 @@ #include "kitemlistselectionmanager.h" #include "private/kitemlistviewlayouter.h" -#include #include #include #include @@ -13,13 +12,13 @@ #ifndef QT_NO_ACCESSIBILITY -KItemListView *KItemListViewAccessible::view() const +KItemListView* KItemListViewAccessible::view() const { return qobject_cast(object()); } -KItemListViewAccessible::KItemListViewAccessible(KItemListView *view_) - : QAccessibleObjectEx(view_) +KItemListViewAccessible::KItemListViewAccessible(KItemListView* view_) : + QAccessibleObjectEx(view_) { Q_ASSERT(view()); } @@ -27,7 +26,12 @@ KItemListViewAccessible::KItemListViewAccessible(KItemListView *view_) void KItemListViewAccessible::modelReset() {} -QAccessibleTable2CellInterface *KItemListViewAccessible::cell(int index) const +QAccessible::Role KItemListViewAccessible::cellRole() const +{ + return QAccessible::Cell; +} + +QAccessibleTable2CellInterface* KItemListViewAccessible::cell(int index) const { if (index > 0) { return new KItemListAccessibleCell(view(), index); @@ -35,12 +39,17 @@ QAccessibleTable2CellInterface *KItemListViewAccessible::cell(int index) const return 0; } -QAccessibleTable2CellInterface *KItemListViewAccessible::cellAt(int row, int column) const +QVariant KItemListViewAccessible::invokeMethodEx(Method, int, const QVariantList &) { - return cell(column * (row - 1) + column) ; + return QVariant(); } -QAccessibleInterface *KItemListViewAccessible::caption() const +QAccessibleTable2CellInterface* KItemListViewAccessible::cellAt(int row, int column) const +{ + return cell(column* (row - 1) + column) ; +} + +QAccessibleInterface* KItemListViewAccessible::caption() const { return 0; } @@ -104,7 +113,7 @@ QList KItemListViewAccessible::selectedRows() const return QList(); } -QAccessibleInterface *KItemListViewAccessible::summary() const +QAccessibleInterface* KItemListViewAccessible::summary() const { return 0; } @@ -142,7 +151,6 @@ bool KItemListViewAccessible::unselectColumn(int) QAccessible2::TableModelChange KItemListViewAccessible::modelChange() const { QAccessible2::TableModelChange change; - // FIXME return change; } @@ -158,7 +166,7 @@ QAccessible::Role KItemListViewAccessible::role(int child) const QAccessible::State KItemListViewAccessible::state(int child) const { if (child) { - QAccessibleInterface *iface; + QAccessibleInterface* iface; navigate(Child,child,&iface); if (iface) { return iface->state(0); @@ -175,16 +183,16 @@ int KItemListViewAccessible::childAt(int x, int y) const int KItemListViewAccessible::childCount() const { - return rowCount() * columnCount(); + return view()->model()->count(); } -int KItemListViewAccessible::indexOfChild(const QAccessibleInterface *iface) const +int KItemListViewAccessible::indexOfChild(const QAccessibleInterface* iface) const { - const KItemListAccessibleCell *widget = static_cast(iface); + const KItemListAccessibleCell* widget = static_cast(iface); return widget->index(); } -QString KItemListViewAccessible::text(Text t, int child) const +QString KItemListViewAccessible::text(Text , int child) const { Q_ASSERT(child == 0); return QString(); @@ -201,7 +209,7 @@ QRect KItemListViewAccessible::rect(int child) const return viewRect.translated(origin); } -int KItemListViewAccessible::navigate(RelationFlag relation, int index, QAccessibleInterface **iface) const +int KItemListViewAccessible::navigate(RelationFlag relation, int index, QAccessibleInterface* *iface) const { *iface = 0; switch (relation) { @@ -219,31 +227,35 @@ int KItemListViewAccessible::navigate(RelationFlag relation, int index, QAccessi return -1; } -QAccessible::Relation KItemListViewAccessible::relationTo(int, const QAccessibleInterface *, int) const +QAccessible::Relation KItemListViewAccessible::relationTo(int, const QAccessibleInterface* , int) const { return QAccessible::Unrelated; } #ifndef QT_NO_ACTION + int KItemListViewAccessible::userActionCount(int) const { return 0; } + QString KItemListViewAccessible::actionText(int, Text, int) const { return QString(); } + bool KItemListViewAccessible::doAction(int, int, const QVariantList &) { return false; } + #endif // 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); } @@ -283,7 +295,7 @@ bool KItemListAccessibleCell::isSelected() const return m_view->controller()->selectionManager()->isSelected(m_index-1); } -void KItemListAccessibleCell::rowColumnExtents(int *row, int *column, int *rowExtents, int *columnExtents, bool *selected) const +void KItemListAccessibleCell::rowColumnExtents(int* row, int* column, int* rowExtents, int* columnExtents, bool* selected) const { KItemListViewLayouter* layouter = m_view->layouter(); *row = layouter->itemRow(m_index); @@ -307,23 +319,23 @@ QAccessible::Role KItemListAccessibleCell::role(int child) const QAccessible::State KItemListAccessibleCell::state(int child) const { Q_ASSERT(child == 0); - QAccessible::State st = Normal; + QAccessible::State state = Normal; if (isSelected()) { - st |= Selected; + state |= Selected; } if (m_view->controller()->selectionManager()->currentItem() == m_index) { - st |= Focused; + state |= Focused; } - st |= Selectable; - st |= Focusable; + state |= Selectable; + state |= Focusable; if (m_view->controller()->selectionBehavior() == KItemListController::MultiSelection){ - st |= MultiSelectable; + state |= MultiSelectable; } - return st; + return state; } bool KItemListAccessibleCell::isExpandable() const @@ -333,13 +345,13 @@ bool KItemListAccessibleCell::isExpandable() const QRect KItemListAccessibleCell::rect(int) const { - QRect r = m_view->itemRect(m_index-1).toRect(); - if (r.isNull()) { + QRect rect = m_view->itemRect(m_index-1).toRect(); + if (rect.isNull()) { return QRect(); } - r.translate(m_view->mapToScene(QPointF(0.0, 0.0)).toPoint()); - r.translate(m_view->scene()->views()[0]->mapToGlobal(QPoint(0, 0))); - return r; + rect.translate(m_view->mapToScene(QPointF(0.0, 0.0)).toPoint()); + rect.translate(m_view->scene()->views()[0]->mapToGlobal(QPoint(0, 0))); + return rect; } QString KItemListAccessibleCell::text(QAccessible::Text t, int child) const @@ -360,7 +372,6 @@ QString KItemListAccessibleCell::text(QAccessible::Text t, int child) const void KItemListAccessibleCell::setText(QAccessible::Text /*t*/, int child, const QString &/*text*/) { Q_ASSERT(child == 0); - // FIXME - is this even allowed on the KItemListWidget? } bool KItemListAccessibleCell::isValid() const @@ -368,7 +379,22 @@ bool KItemListAccessibleCell::isValid() const return m_view && (m_index > 0); } -int KItemListAccessibleCell::navigate(RelationFlag relation, int index, QAccessibleInterface **iface) const +int KItemListAccessibleCell::childAt(int, int) const +{ + return 0; +} + +int KItemListAccessibleCell::childCount() const +{ + return 0; +} + +int KItemListAccessibleCell::indexOfChild(const QAccessibleInterface* child) const +{ + return -1; +} + +int KItemListAccessibleCell::navigate(RelationFlag relation, int index, QAccessibleInterface* *iface) const { if (relation == Ancestor && index == 1) { *iface = new KItemListViewAccessible(m_view); @@ -387,7 +413,7 @@ int KItemListAccessibleCell::navigate(RelationFlag relation, int index, QAccessi } case Sibling: if (index > 0) { - QAccessibleInterface *parent = queryAccessibleInterface(m_view); + QAccessibleInterface* parent = queryAccessibleInterface(m_view); int ret = parent->navigate(QAccessible::Child, index, iface); delete parent; if (*iface) { @@ -402,7 +428,7 @@ int KItemListAccessibleCell::navigate(RelationFlag relation, int index, QAccessi return -1; } -QAccessible::Relation KItemListAccessibleCell::relationTo(int child, const QAccessibleInterface *, int otherChild) const +QAccessible::Relation KItemListAccessibleCell::relationTo(int child, const QAccessibleInterface* , int otherChild) const { Q_ASSERT(child == 0); Q_ASSERT(otherChild == 0); @@ -410,6 +436,7 @@ QAccessible::Relation KItemListAccessibleCell::relationTo(int child, const QAcce } #ifndef QT_NO_ACTION + int KItemListAccessibleCell::userActionCount(int) const { return 0; @@ -427,8 +454,18 @@ bool KItemListAccessibleCell::doAction(int, int, const QVariantList &) #endif -KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer *container) - : QAccessibleWidgetEx(container) +int KItemListAccessibleCell::index() const +{ + return m_index; +} + +QObject* KItemListAccessibleCell::object() const +{ + return 0; +} + +KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer* container) : + QAccessibleWidgetEx(container) {} KItemListContainerAccessible::~KItemListContainerAccessible () @@ -439,7 +476,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 1; @@ -447,7 +484,7 @@ int KItemListContainerAccessible::indexOfChild ( const QAccessibleInterface * ch return -1; } -int KItemListContainerAccessible::navigate ( QAccessible::RelationFlag relation, int index, QAccessibleInterface ** target ) const +int KItemListContainerAccessible::navigate ( QAccessible::RelationFlag relation, int index, QAccessibleInterface** target ) const { if (relation == QAccessible::Child) { *target = new KItemListViewAccessible(container()->controller()->view()); diff --git a/src/kitemviews/kitemlistviewaccessible.h b/src/kitemviews/kitemlistviewaccessible.h index afc04797f..bd1ca254d 100644 --- a/src/kitemviews/kitemlistviewaccessible.h +++ b/src/kitemviews/kitemlistviewaccessible.h @@ -5,6 +5,7 @@ #include #include #include +#include #include "kitemlistview.h" #include "kitemlistcontainer.h" @@ -17,7 +18,7 @@ class KItemListViewAccessible: public QAccessibleTable2Interface, public QAccess { Q_ACCESSIBLE_OBJECT public: - explicit KItemListViewAccessible(KItemListView *view); + explicit KItemListViewAccessible(KItemListView* view); virtual ~KItemListViewAccessible(); @@ -28,22 +29,22 @@ public: int childAt(int x, int y) const; int childCount() const; - int indexOfChild(const QAccessibleInterface *) const; + int indexOfChild(const QAccessibleInterface* ) const; - int navigate(RelationFlag relation, int index, QAccessibleInterface **iface) const; - Relation relationTo(int child, const QAccessibleInterface *other, int otherChild) const; + int navigate(RelationFlag relation, int index, QAccessibleInterface** iface) const; + Relation relationTo(int child, const QAccessibleInterface* other, int otherChild) const; #ifndef QT_NO_ACTION int userActionCount(int child) const; QString actionText(int action, Text t, int child) const; bool doAction(int action, int child, const QVariantList ¶ms); #endif - QVariant invokeMethodEx(Method, int, const QVariantList &) { return QVariant(); } + QVariant invokeMethodEx(Method, int, const QVariantList &); // Table2 interface - virtual QAccessibleTable2CellInterface *cellAt(int row, int column) const; - virtual QAccessibleInterface *caption() const; - virtual QAccessibleInterface *summary() const; + virtual QAccessibleTable2CellInterface* cellAt(int row, int column) const; + virtual QAccessibleInterface* caption() const; + virtual QAccessibleInterface* summary() const; virtual QString columnDescription(int column) const; virtual QString rowDescription(int row) const; virtual int columnCount() const; @@ -70,46 +71,31 @@ public: virtual bool unselectRow(int row); virtual bool unselectColumn(int column); - KItemListView *view() const; + KItemListView* view() const; protected: virtual void modelReset(); - inline QAccessibleTable2CellInterface *cell(int index) const; - inline QAccessible::Role cellRole() const { - return QAccessible::Cell; - } + inline QAccessibleTable2CellInterface* cell(int index) const; + inline QAccessible::Role cellRole() const; }; class KItemListAccessibleCell: public QAccessibleTable2CellInterface { public: - KItemListAccessibleCell(KItemListView *view, int m_index); + KItemListAccessibleCell(KItemListView* view, int m_index); - QObject *object() const - { - return 0; - } + QObject* object() const; Role role(int) const; State state(int) const; QRect rect(int) const; bool isValid() const; - - inline int childAt(int, int) const { - return 0; - } - inline int childCount() const { - return 0; - } - inline int indexOfChild(const QAccessibleInterface *) const { - return -1; - } - + int childAt(int, int) const; + int childCount() const; + int indexOfChild(const QAccessibleInterface*) const; QString text(Text t, int child) const; - void setText(Text t, int child, const QString &text); - - int navigate(RelationFlag relation, int m_index, QAccessibleInterface **iface) const; - Relation relationTo(int child, const QAccessibleInterface *other, int otherChild) const; - + void setText(Text t, int child, const QString& text); + int navigate(RelationFlag relation, int m_index, QAccessibleInterface** iface) const; + Relation relationTo(int child, const QAccessibleInterface* other, int otherChild) const; bool isExpandable() const; #ifndef QT_NO_ACTION @@ -120,18 +106,16 @@ public: // Cell Interface virtual int columnExtent() const; - virtual QList columnHeaderCells() const; + virtual QList columnHeaderCells() const; virtual int columnIndex() const; virtual int rowExtent() const; - virtual QList rowHeaderCells() const; + virtual QList rowHeaderCells() const; virtual int rowIndex() const; virtual bool isSelected() const; - virtual void rowColumnExtents(int *row, int *column, int *rowExtents, int *columnExtents, bool *selected) const; + virtual void rowColumnExtents(int* row, int* column, int* rowExtents, int* columnExtents, bool* selected) const; virtual QAccessibleTable2Interface* table() const; - inline int index() const { - return m_index; - } + inline int index() const; private: QPointer m_view; @@ -147,13 +131,13 @@ public: explicit KItemListContainerAccessible(KItemListContainer*); virtual ~KItemListContainerAccessible(); int childCount () const; - int indexOfChild ( const QAccessibleInterface * child ) const; - int navigate ( RelationFlag relation, int entry, QAccessibleInterface ** target ) const; + int indexOfChild ( const QAccessibleInterface* child ) const; + int navigate ( RelationFlag relation, int entry, QAccessibleInterface** target ) const; private: - inline KItemListContainer *container() const + inline KItemListContainer* container() const { - return static_cast(object()); + return static_cast(object()); } }; -- cgit v1.3 From 28239e6ca82961983f4421a2d485296ef546b05a Mon Sep 17 00:00:00 2001 From: Amandeep Singh Date: Wed, 15 Aug 2012 12:27:00 +0530 Subject: Removing in-class functions and unnecessary destructor --- src/kitemviews/kitemlistview.cpp | 2 +- src/kitemviews/kitemlistview.h | 2 +- src/kitemviews/kitemlistviewaccessible.cpp | 1 + src/kitemviews/kitemlistviewaccessible.h | 2 -- 4 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/kitemviews/kitemlistview.cpp') diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index 07150a0d3..681b37b5f 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -659,7 +659,7 @@ void KItemListView::paint(QPainter* painter, const QStyleOptionGraphicsItem* opt } } -KItemListViewLayouter* layouter() const +KItemListViewLayouter* KItemListView::layouter() const { return m_layouter; } diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h index 4460a36a5..2c30c6f43 100644 --- a/src/kitemviews/kitemlistview.h +++ b/src/kitemviews/kitemlistview.h @@ -278,7 +278,7 @@ public: /** * @return The Layouter for the view */ - inline KItemListViewLayouter* layouter() const; + KItemListViewLayouter* layouter() const; signals: void scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous); diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp index c0b64fcdc..70cf0896e 100644 --- a/src/kitemviews/kitemlistviewaccessible.cpp +++ b/src/kitemviews/kitemlistviewaccessible.cpp @@ -464,6 +464,7 @@ QObject* KItemListAccessibleCell::object() const return 0; } +// Container Interface KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer* container) : QAccessibleWidgetEx(container) {} diff --git a/src/kitemviews/kitemlistviewaccessible.h b/src/kitemviews/kitemlistviewaccessible.h index bd1ca254d..821b483a1 100644 --- a/src/kitemviews/kitemlistviewaccessible.h +++ b/src/kitemviews/kitemlistviewaccessible.h @@ -20,8 +20,6 @@ class KItemListViewAccessible: public QAccessibleTable2Interface, public QAccess public: explicit KItemListViewAccessible(KItemListView* view); - virtual ~KItemListViewAccessible(); - Role role(int child) const; State state(int child) const; QString text(Text t, int child) const; -- cgit v1.3 From 4196026cd8a625e8c091f149a9cef0aded416fe7 Mon Sep 17 00:00:00 2001 From: Amandeep Singh Date: Sat, 22 Sep 2012 14:27:17 +0530 Subject: Making code confirm to policy --- src/kitemviews/kitemlistview.cpp | 7 +++++-- src/kitemviews/kitemlistviewaccessible.cpp | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/kitemviews/kitemlistview.cpp') diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index 681b37b5f..580cf5bbe 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -55,9 +55,12 @@ namespace { } #ifndef QT_NO_ACCESSIBILITY -QAccessibleInterface* accessibleViewFactory(const QString &key, QObject *object) +QAccessibleInterface* accessibleInterfaceFactory(const QString &key, QObject *object) { Q_UNUSED(key) + if (KItemListContainer*view = qobject_cast(object)) { + return new KItemListContainerAccessible(view); + } if (KItemListView *view = qobject_cast(object)) { return new KItemListViewAccessible(view); } @@ -125,7 +128,7 @@ KItemListView::KItemListView(QGraphicsWidget* parent) : m_header = new KItemListHeader(this); #ifndef QT_NO_ACCESSIBILITY - QAccessible::installFactory(accessibleViewFactory); + QAccessible::installFactory(accessibleInterfaceFactory); #endif } diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp index 70cf0896e..48bafc39a 100644 --- a/src/kitemviews/kitemlistviewaccessible.cpp +++ b/src/kitemviews/kitemlistviewaccessible.cpp @@ -46,7 +46,7 @@ QVariant KItemListViewAccessible::invokeMethodEx(Method, int, const QVariantList QAccessibleTable2CellInterface* KItemListViewAccessible::cellAt(int row, int column) const { - return cell(column* (row - 1) + column) ; + return cell(column * (row-1) + column) ; } QAccessibleInterface* KItemListViewAccessible::caption() const -- cgit v1.3