From: Amandeep Singh Date: Mon, 13 Aug 2012 18:02:50 +0000 (+0530) Subject: Reverting KListSelectionManager, removing unneccessary a11y factories X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/7ac839a234d89f130f9be31992b565ec0d71a960 Reverting KListSelectionManager, removing unneccessary a11y factories --- 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