Remove reimplementation of functions.

The base class implementations are actually good and without some problems.
Save one pointer's worth of memory by not having m_container.

rect was returning a relative rectangle always.

State was wrongly returning HasInvokeExtension which can lead to crashes.

diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index 38c350b69aae7dfa84ba1731dd8b6a83e50e2165..7ec72dcf672029e0d068a14021b322457091f527 100644 (file)
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -575,7 +575,6 @@ bool KItemListWidgetAccessible::doAction(int, int, const QVariantList &)
 
 KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer *container)
     : QAccessibleWidgetEx(container)
 
 KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer *container)
     : QAccessibleWidgetEx(container)

-    , m_container(container)

 {}
 
 KItemListContainerAccessible::~KItemListContainerAccessible ()
 {}
 
 KItemListContainerAccessible::~KItemListContainerAccessible ()


@@ -588,56 +587,20 @@ int KItemListContainerAccessible::childCount () const
 
 int KItemListContainerAccessible::indexOfChild ( const QAccessibleInterface * child ) const
 {
 
 int KItemListContainerAccessible::indexOfChild ( const QAccessibleInterface * child ) const
 {

-    if(child == QAccessible::queryAccessibleInterface(m_container->controller()->view()))
+    if(child == QAccessible::queryAccessibleInterface(container()->controller()->view()))

         return 1;
     return -1;
 }
 
         return 1;
     return -1;
 }
 

-bool KItemListContainerAccessible::isValid () const
-{
-    return true;
-}
-

 int KItemListContainerAccessible::navigate ( QAccessible::RelationFlag relation, int index, QAccessibleInterface ** target ) const
 {
     if (relation == QAccessible::Child) {
 int KItemListContainerAccessible::navigate ( QAccessible::RelationFlag relation, int index, QAccessibleInterface ** target ) const
 {
     if (relation == QAccessible::Child) {

-        *target = new KItemListViewAccessible(m_container->controller()->view());
+        *target = new KItemListViewAccessible(container()->controller()->view());

         return 0;
     }
     return QAccessibleWidgetEx::navigate(relation, index, target);
 }
 
         return 0;
     }
     return QAccessibleWidgetEx::navigate(relation, index, target);
 }
 

-QObject *KItemListContainerAccessible::object() const
-{
-    return m_container;
-}
-
-QRect KItemListContainerAccessible::rect ( int child ) const
-{
-    if(child){
-        KItemListViewAccessible *iface = static_cast<KItemListViewAccessible* >(QAccessible::queryAccessibleInterface(m_container->controller()->view()));
-        return iface->rect(0);
-    }
-    return m_container->frameRect();
-}
-
-QAccessible::Relation KItemListContainerAccessible::relationTo ( int , const QAccessibleInterface *, int ) const
-{
-    return QAccessible::Unrelated;
-}
-
-QAccessible::Role KItemListContainerAccessible::role ( int child ) const 
-{
-    if(child)
-        return QAccessible::Table;
-    return QAccessible::Pane;
-}
-
-QAccessible::State KItemListContainerAccessible::state ( int child ) const
-{
-    return Normal | HasInvokeExtension;
-}
-

 #endif // QT_NO_ITEMVIEWS
 
 #endif // QT_NO_ACCESSIBILITY
 #endif // QT_NO_ITEMVIEWS
 
 #endif // QT_NO_ACCESSIBILITY

diff --git a/src/kitemviews/kitemlistviewaccessible.h b/src/kitemviews/kitemlistviewaccessible.h
index 23809a0329be8b6cd880d9fe375feda1778a9658..15391c60162a183f37daaa60e55aa02ff33e2c47 100644 (file)
--- a/src/kitemviews/kitemlistviewaccessible.h
+++ b/src/kitemviews/kitemlistviewaccessible.h
@@ -165,18 +165,15 @@ class KItemListContainerAccessible : public QAccessibleWidgetEx
     Q_ACCESSIBLE_OBJECT
 public:
     explicit KItemListContainerAccessible(KItemListContainer*);
     Q_ACCESSIBLE_OBJECT
 public:
     explicit KItemListContainerAccessible(KItemListContainer*);

-    virtual  ~KItemListContainerAccessible ();
-    int  childCount () const ;
-    int  indexOfChild ( const QAccessibleInterface * child ) const ;
-    bool isValid () const ;
-    int  navigate ( RelationFlag relation, int entry, QAccessibleInterface ** target ) const ;
-    QObject * object () const ;
-    QRect rect ( int child ) const ;
-    QAccessible::Relation relationTo ( int child, const QAccessibleInterface * other, int otherChild ) const ;
-    QAccessible::Role role ( int child ) const ;
-    QAccessible::State state ( int child ) const ;
+    virtual  ~KItemListContainerAccessible();
+    int  childCount () const;
+    int  indexOfChild ( const QAccessibleInterface * child ) const;
+    int  navigate ( RelationFlag relation, int entry, QAccessibleInterface ** target ) const;
+

 private:
 private:

-    KItemListContainer *m_container ;
+    inline KItemListContainer *container() const {
+        return static_cast<KItemListContainer *>(object());
+    }

 };
 
 #endif // QT_NO_ITEMVIEWS
 };
 
 #endif // QT_NO_ITEMVIEWS