Fix coding style and unnecessary complexity in KItemListViewAccessible

CCMAIL: aman.dedman@gmail.com
CCMAIL: gladhorn@kde.org

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 54a8cbfff186e47c53041346f565ac03dfad6023..f2ae37556d9413fd126ff49d6e969b7fb209bcdd 100644 (file)
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -23,6 +23,7 @@
 #include "kitemlistview.h"
 
 #include <KDebug>
+#include "kitemlistcontainer.h"
 #include "kitemlistcontroller.h"
 #include "kitemlistheader.h"
 #include "kitemlistselectionmanager.h"
@@ -58,12 +59,13 @@ namespace {
 QAccessibleInterface* accessibleInterfaceFactory(const QString &key, QObject *object)
 {
     Q_UNUSED(key)
-    if (KItemListContainer*view = qobject_cast<KItemListContainer*>(object)) {
-        return new KItemListContainerAccessible(view);
-    }
-    if (KItemListView *view = qobject_cast<KItemListView*>(object)) {
+
+    if (KItemListContainer* container = qobject_cast<KItemListContainer*>(object)) {
+        return new KItemListContainerAccessible(container);
+    } else if (KItemListView* view = qobject_cast<KItemListView*>(object)) {
         return new KItemListViewAccessible(view);
     }
+
     return 0;
 }
 #endif

diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index 28a92edce74273fac9193e32740e221de146e0d5..c46e169fc8875adaa6089532c92ddd8d88fee045 100644 (file)
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -1,6 +1,9 @@
 #include "kitemlistviewaccessible.h"
+
+#include "kitemlistcontainer.h"
 #include "kitemlistcontroller.h"
 #include "kitemlistselectionmanager.h"
+#include "kitemlistview.h"
 #include "private/kitemlistviewlayouter.h"
 
 #include <QtGui/qaccessible2.h>
@@ -24,7 +27,8 @@ KItemListViewAccessible::KItemListViewAccessible(KItemListView* view_) :
 }
 
 void KItemListViewAccessible::modelReset()
-{}
+{
+}
 
 QAccessible::Role KItemListViewAccessible::cellRole() const
 {
@@ -33,20 +37,22 @@ QAccessible::Role KItemListViewAccessible::cellRole() const
 
 QAccessibleTable2CellInterface* KItemListViewAccessible::cell(int index) const
 {
-    if (index < 0 || index >= view()->model()->count())
+    if (index < 0 || index >= view()->model()->count()) {
         return 0;
-    return new KItemListAccessibleCell(view(), index);
+    } else {
+        return new KItemListAccessibleCell(view(), index);
+    }
 }
 
-QVariant KItemListViewAccessible::invokeMethodEx(Method, int, const QVariantList &)
+QVariant KItemListViewAccessible::invokeMethodEx(Method, int, const QVariantList&)
 {
     return QVariant();
 }
 
 QAccessibleTable2CellInterface* KItemListViewAccessible::cellAt(int row, int column) const
 {
-    qDebug() << "cellAt: " << row << column << " is: " << column*row + column;
-    return cell(columnCount()*row + column);
+    kDebug() << "cellAt: " << row << column << " is: " << column*row + column;
+    return cell(columnCount() * row + column);
 }
 
 QAccessibleInterface* KItemListViewAccessible::caption() const
@@ -66,14 +72,17 @@ int KItemListViewAccessible::columnCount() const
 
 int KItemListViewAccessible::rowCount() const
 {
-    if(columnCount() <= 0) {
+    if (columnCount() <= 0) {
         return 0;
     }
+
     int itemCount = view()->model()->count();
     int rowCount = itemCount / columnCount();
-    if(rowCount <= 0){
+
+    if (rowCount <= 0) {
         return 0;
     }
+
     if (itemCount % columnCount()) {
         ++rowCount;
     }
@@ -165,27 +174,30 @@ QAccessible2::TableModelChange KItemListViewAccessible::modelChange() const
 QAccessible::Role KItemListViewAccessible::role(int child) const
 {
     Q_ASSERT(child >= 0);
+
     if (child > 0) {
         return QAccessible::Cell;
+    } else {
+        return QAccessible::Table;
     }
-    return QAccessible::Table;
 }
 
 QAccessible::State KItemListViewAccessible::state(int child) const
 {
     if (child) {
-        QAccessibleInterface* iface = 0;
-        navigate(Child, child, &iface);
-        if (iface) {
-            return iface->state(0);
+        QAccessibleInterface* interface = 0;
+        navigate(Child, child, &interface);
+        if (interface) {
+            return interface->state(0);
         }
     }
+
     return QAccessible::Normal | QAccessible::HasInvokeExtension;
 }
 
 int KItemListViewAccessible::childAt(int x, int y) const
 {
-    QPointF point = QPointF(x,y);
+    const QPointF point = QPointF(x,y);
     return view()->itemAt(view()->mapFromScene(point));
 }
 
@@ -194,13 +206,13 @@ int KItemListViewAccessible::childCount() const
     return view()->model()->count();
 }
 
-int KItemListViewAccessible::indexOfChild(const QAccessibleInterface* iface) const
+int KItemListViewAccessible::indexOfChild(const QAccessibleInterface* interface) const
 {
-    const KItemListAccessibleCell* widget = static_cast<const KItemListAccessibleCell*>(iface);
+    const KItemListAccessibleCell* widget = static_cast<const KItemListAccessibleCell*>(interface);
     return widget->index() + 1;
 }
 
-QString KItemListViewAccessible::text(Text , int child) const
+QString KItemListViewAccessible::text(Text, int child) const
 {
     Q_ASSERT(child == 0);
     return QString();
@@ -212,30 +224,32 @@ QRect KItemListViewAccessible::rect(int child) const
     if (!view()->isVisible()) {
         return QRect();
     }
-    QPoint origin = view()->scene()->views()[0]->mapToGlobal(QPoint(0, 0));
-    QRect viewRect = view()->geometry().toRect();
+    const QPoint origin = view()->scene()->views()[0]->mapToGlobal(QPoint(0, 0));
+    const QRect viewRect = view()->geometry().toRect();
     return viewRect.translated(origin);
 }
 
-int KItemListViewAccessible::navigate(RelationFlag relation, int index, QAccessibleInterface* *iface) const
+int KItemListViewAccessible::navigate(RelationFlag relation, int index, QAccessibleInterface** interface) const
 {
-    *iface = 0;
+    *interface = 0;
+
     switch (relation) {
-        case QAccessible::Child: {
-            Q_ASSERT(index > 0);
-            *iface = cell(index - 1);
-            if (*iface) {
-                return 0;
-            }
-            break;
+    case QAccessible::Child:
+        Q_ASSERT(index > 0);
+        *interface = cell(index - 1);
+        if (*interface) {
+            return 0;
         }
-        default:
-            break;
+        break;
+
+    default:
+        break;
     }
+
     return -1;
 }
 
-QAccessible::Relation KItemListViewAccessible::relationTo(int, const QAccessibleInterface* , int) const
+QAccessible::Relation KItemListViewAccessible::relationTo(int, const QAccessibleInterface*, int) const
 {
     return QAccessible::Unrelated;
 }
@@ -252,7 +266,7 @@ QString KItemListViewAccessible::actionText(int, Text, int) const
     return QString();
 }
 
-bool KItemListViewAccessible::doAction(int, int, const QVariantList &)
+bool KItemListViewAccessible::doAction(int, int, const QVariantList&)
 {
     return false;
 }
@@ -305,7 +319,7 @@ bool KItemListAccessibleCell::isSelected() const
 
 void KItemListAccessibleCell::rowColumnExtents(int* row, int* column, int* rowExtents, int* columnExtents, bool* selected) const
 {
-    KItemListViewLayouter* layouter = m_view->m_layouter;
+    const KItemListViewLayouter* layouter = m_view->m_layouter;
     *row = layouter->itemRow(m_index);
     *column = layouter->itemColumn(m_index);
     *rowExtents = 1;
@@ -332,6 +346,7 @@ QAccessible::State KItemListAccessibleCell::state(int child) const
     if (isSelected()) {
          state |= Selected;
     }
+
     if (m_view->controller()->selectionManager()->currentItem() == m_index) {
         state |= Focused;
     }
@@ -339,18 +354,18 @@ QAccessible::State KItemListAccessibleCell::state(int child) const
     state |= Selectable;
     state |= Focusable;
 
-    if (m_view->controller()->selectionBehavior() == KItemListController::MultiSelection){
+    if (m_view->controller()->selectionBehavior() == KItemListController::MultiSelection) {
         state |= MultiSelectable;
     }
 
     if (m_view->model()->isExpandable(m_index)) {
-        if(m_view->model()->isExpanded(m_index)) {
+        if (m_view->model()->isExpanded(m_index)) {
             state |= Expanded;
-        }
-        else {
+        } else {
             state |= Collapsed;
         }
     }
+
     return state;
 }
 
@@ -362,9 +377,11 @@ bool KItemListAccessibleCell::isExpandable() const
 QRect KItemListAccessibleCell::rect(int) const
 {
     QRect rect = m_view->itemRect(m_index).toRect();
+
     if (rect.isNull()) {
         return QRect();
     }
+
     rect.translate(m_view->mapToScene(QPointF(0.0, 0.0)).toPoint());
     rect.translate(m_view->scene()->views()[0]->mapToGlobal(QPoint(0, 0)));
     return rect;
@@ -374,18 +391,22 @@ QString KItemListAccessibleCell::text(QAccessible::Text t, int child) const
 {
     Q_ASSERT(child == 0);
     Q_UNUSED(child)
-    const QHash<QByteArray, QVariant> data = m_view->model()->data(m_index);
+
     switch (t) {
     case QAccessible::Value:
-    case QAccessible::Name:
+    case QAccessible::Name: {
+        const QHash<QByteArray, QVariant> data = m_view->model()->data(m_index);
         return data["text"].toString();
+    }
+
     default:
         break;
     }
+
     return QString();
 }
 
-void KItemListAccessibleCell::setText(QAccessible::Text /*t*/, int child, const QString &/*text*/)
+void KItemListAccessibleCell::setText(QAccessible::Text, int child, const QString&)
 {
     Q_ASSERT(child == 0);
 }
@@ -411,27 +432,14 @@ int KItemListAccessibleCell::indexOfChild(const QAccessibleInterface* child) con
     return -1;
 }
 
-int KItemListAccessibleCell::navigate(RelationFlag relation, int index, QAccessibleInterface* *iface) const
+int KItemListAccessibleCell::navigate(RelationFlag relation, int index, QAccessibleInterface** interface) const
 {
     if (relation == Ancestor && index == 1) {
-        *iface = new KItemListViewAccessible(m_view);
+        *interface = new KItemListViewAccessible(m_view);
         return 0;
     }
 
-    *iface = 0;
-    if (!m_view) {
-        return -1;
-    }
-
-    switch (relation) {
-
-    case Child: {
-        return -1;
-    }
-    default:
-        break;
-    }
-
+    *interface = 0;
     return -1;
 }
 
@@ -454,7 +462,7 @@ QString KItemListAccessibleCell::actionText(int, Text, int) const
     return QString();
 }
 
-bool KItemListAccessibleCell::doAction(int, int, const QVariantList &)
+bool KItemListAccessibleCell::doAction(int, int, const QVariantList&)
 {
     return false;
 }
@@ -474,31 +482,40 @@ QObject* KItemListAccessibleCell::object() const
 // Container Interface
 KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer* container) :
     QAccessibleWidgetEx(container)
-{}
+{
+}
 
-KItemListContainerAccessible::~KItemListContainerAccessible ()
-{}
+KItemListContainerAccessible::~KItemListContainerAccessible()
+{
+}
 
-int KItemListContainerAccessible::childCount () const
+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;
+    } else {
+        return -1;
     }
-    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());
         return 0;
+    } else {
+        return QAccessibleWidgetEx::navigate(relation, index, target);
     }
-    return QAccessibleWidgetEx::navigate(relation, index, target);
+}
+
+const KItemListContainer* KItemListContainerAccessible::container() const
+{
+    return qobject_cast<KItemListContainer*>(object());
 }
 
 #endif // QT_NO_ACCESSIBILITY

diff --git a/src/kitemviews/kitemlistviewaccessible.h b/src/kitemviews/kitemlistviewaccessible.h
index bab76c17904a8eba3406a6eec2c358bbf03c7cec..0bd7300c0c1ff8401072724abb32d77bd1451bfe 100644 (file)
--- a/src/kitemviews/kitemlistviewaccessible.h
+++ b/src/kitemviews/kitemlistviewaccessible.h
@@ -1,22 +1,21 @@
-#ifndef ACCESSIBLE_ITEMVIEWS_H
-#define ACCESSIBLE_ITEMVIEWS_H
+#ifndef KITEMLISTVIEWACCESSIBLE_H
+#define KITEMLISTVIEWACCESSIBLE_H
 
-#include "QtCore/qpointer.h"
+#include <QtCore/qpointer.h>
 #include <QtGui/qaccessible.h>
 #include <QtGui/qaccessible2.h>
 #include <QtGui/qaccessiblewidget.h>
 #include <QtGui/qaccessibleobject.h>
 
-#include "kitemlistview.h"
-#include "kitemlistcontainer.h"
-
 #ifndef QT_NO_ACCESSIBILITY
 
-class KItemListAccessibleCell;
+class KItemListView;
+class KItemListContainer;
 
 class KItemListViewAccessible: public QAccessibleTable2Interface, public QAccessibleObjectEx
 {
     Q_ACCESSIBLE_OBJECT
+
 public:
     explicit KItemListViewAccessible(KItemListView* view);
 
@@ -27,17 +26,17 @@ 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;
+    int navigate(RelationFlag relation, int index, QAccessibleInterface** interface) 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 &params);
+    bool doAction(int action, int child, const QVariantList& params);
 #endif
-    QVariant invokeMethodEx(Method, int, const QVariantList &);
+    QVariant invokeMethodEx(Method, int, const QVariantList&);
 
     // Table2 interface
     virtual QAccessibleTable2CellInterface* cellAt(int row, int column) const;
@@ -96,22 +95,22 @@ public:
     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;
+    int navigate(RelationFlag relation, int m_index, QAccessibleInterface** interface) const;
     Relation relationTo(int child, const QAccessibleInterface* other, int otherChild) const;
     bool isExpandable() 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 &params);
+    bool doAction(int action, int child, const QVariantList& params);
 #endif
 
     // Cell Interface
     virtual int columnExtent() const;
-    virtual QList<QAccessibleInterface* > columnHeaderCells() const;
+    virtual QList<QAccessibleInterface*> columnHeaderCells() const;
     virtual int columnIndex() const;
     virtual int rowExtent() const;
-    virtual QList<QAccessibleInterface* > rowHeaderCells() const;
+    virtual QList<QAccessibleInterface*> rowHeaderCells() const;
     virtual int rowIndex() const;
     virtual bool isSelected() const;
     virtual void rowColumnExtents(int* row, int* column, int* rowExtents, int* columnExtents, bool* selected) const;
@@ -122,27 +121,24 @@ public:
 private:
     QPointer<KItemListView> m_view;
     int m_index;
-
-friend class KItemListViewAccessible;
 };
 
 class KItemListContainerAccessible : public QAccessibleWidgetEx
 {
     Q_ACCESSIBLE_OBJECT
+
 public:
-    explicit KItemListContainerAccessible(KItemListContainer*);
+    explicit KItemListContainerAccessible(KItemListContainer* container);
     virtual ~KItemListContainerAccessible();
-    int childCount () const;
-    int indexOfChild ( const QAccessibleInterface* child ) const;
-    int navigate ( RelationFlag relation, int entry, QAccessibleInterface** target ) const;
+
+    int childCount() const;
+    int indexOfChild(const QAccessibleInterface* child) const;
+    int navigate(RelationFlag relation, int entry, QAccessibleInterface** target) const;
 
 private:
-    inline KItemListContainer* container() const
-    {
-        return static_cast<KItemListContainer* >(object());
-    }
+    const KItemListContainer* container() const;
 };
 
 #endif // QT_NO_ACCESSIBILITY
 
-#endif // ACCESSIBLE_ITEMVIEWS_H
+#endif