From 5dc8ab409faaf9bd5f0a75f0ac760cbd91fd7774 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Fri, 8 Nov 2013 12:41:20 +0100 Subject: Move QTreeView::accessibleTree2Index to the private class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's not needed to expose that symbol. Change-Id: I65b752a41d80eb0779969fa3887c081b4c2c88db Reviewed-by: Jan Arve Sæther --- src/widgets/itemviews/qtreeview.cpp | 25 +++++++++++++++---------- src/widgets/itemviews/qtreeview.h | 1 - src/widgets/itemviews/qtreeview_p.h | 2 ++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index 792b75ac69..fc0d639483 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -3888,6 +3888,14 @@ void QTreeViewPrivate::_q_sortIndicatorChanged(int column, Qt::SortOrder order) model->sort(column, order); } +int QTreeViewPrivate::accessibleTree2Index(const QModelIndex &index) const +{ + Q_Q(const QTreeView); + + // Note that this will include the header, even if its hidden. + return (q->visualIndex(index) + (q->header() ? 1 : 0)) * index.model()->columnCount() + index.column(); +} + /*! \reimp */ @@ -3911,8 +3919,10 @@ void QTreeView::currentChanged(const QModelIndex ¤t, const QModelIndex &pr } #ifndef QT_NO_ACCESSIBILITY if (QAccessible::isActive() && current.isValid()) { + Q_D(QTreeView); + QAccessibleEvent event(this, QAccessible::Focus); - event.setChild(accessibleTree2Index(current)); + event.setChild(d->accessibleTree2Index(current)); QAccessible::updateAccessibility(&event); } #endif @@ -3927,10 +3937,12 @@ void QTreeView::selectionChanged(const QItemSelection &selected, QAbstractItemView::selectionChanged(selected, deselected); #ifndef QT_NO_ACCESSIBILITY if (QAccessible::isActive()) { + Q_D(QTreeView); + // ### does not work properly for selection ranges. QModelIndex sel = selected.indexes().value(0); if (sel.isValid()) { - int entry = accessibleTree2Index(sel); + int entry = d->accessibleTree2Index(sel); Q_ASSERT(entry >= 0); QAccessibleEvent event(this, QAccessible::Selection); event.setChild(entry); @@ -3938,7 +3950,7 @@ void QTreeView::selectionChanged(const QItemSelection &selected, } QModelIndex desel = deselected.indexes().value(0); if (desel.isValid()) { - int entry = accessibleTree2Index(desel); + int entry = d->accessibleTree2Index(desel); Q_ASSERT(entry >= 0); QAccessibleEvent event(this, QAccessible::SelectionRemove); event.setChild(entry); @@ -3955,13 +3967,6 @@ int QTreeView::visualIndex(const QModelIndex &index) const return d->viewIndex(index); } -int QTreeView::accessibleTree2Index(const QModelIndex &index) const -{ - // Note that this will include the header, even if its hidden. - return (visualIndex(index) + (header() ? 1 : 0)) * index.model()->columnCount() + index.column(); -} - - QT_END_NAMESPACE #include "moc_qtreeview.cpp" diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h index a29e9b64b0..d9c6cd9269 100644 --- a/src/widgets/itemviews/qtreeview.h +++ b/src/widgets/itemviews/qtreeview.h @@ -224,7 +224,6 @@ private: friend class QAccessibleTree; friend class QAccessibleTableCell; int visualIndex(const QModelIndex &index) const; - int accessibleTree2Index(const QModelIndex &index) const; Q_DECLARE_PRIVATE(QTreeView) Q_DISABLE_COPY(QTreeView) diff --git a/src/widgets/itemviews/qtreeview_p.h b/src/widgets/itemviews/qtreeview_p.h index 89de435606..5d6333e856 100644 --- a/src/widgets/itemviews/qtreeview_p.h +++ b/src/widgets/itemviews/qtreeview_p.h @@ -239,6 +239,8 @@ public: return (viewIndex(index) + (header ? 1 : 0)) * model->columnCount()+index.column(); } + int accessibleTree2Index(const QModelIndex &index) const; + // used for spanning rows QVector spanningIndexes; -- cgit v1.2.3