From ce1adc8f09ae9e15c03532c4d7c535b47fdd81b2 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 6 Aug 2012 18:08:43 +0200 Subject: [PATCH] Remove some dubious code for now (crash less) --- src/kitemviews/kitemlistviewaccessible.cpp | 31 +++++++++++----------- src/kitemviews/kitemlistviewaccessible.h | 3 +-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp index eec051b28..c348428fa 100644 --- a/src/kitemviews/kitemlistviewaccessible.cpp +++ b/src/kitemviews/kitemlistviewaccessible.cpp @@ -366,7 +366,9 @@ int KItemListWidgetAccessible::rowIndex() const //Done bool KItemListWidgetAccessible::isSelected() const { - return widget->isSelected(); + //return widget->isSelected(); + // FIXME + return false; } void KItemListWidgetAccessible::rowColumnExtents(int *row, int *column, int *rowExtents, int *columnExtents, bool *selected) const @@ -400,8 +402,8 @@ QAccessible::State KItemListWidgetAccessible::state(int child) const //if (!globalRect.intersects(rect(0))) // st |= Invisible; - if (widget->isSelected()) - st |= Selected; +// if (widget->isSelected()) +// st |= Selected; if (view->controller()->selectionManager()->currentItem() == index) st |= Focused; @@ -454,24 +456,23 @@ QString KItemListWidgetAccessible::text(Text t, int child) const { Q_ASSERT(child == 0); - QHash data = widget->data(); - switch (t) { - case QAccessible::Value: - case QAccessible::Name: - return data["text"].toString(); - case QAccessible::Description: - return data["text"].toString() + " : " + data["group"].toString(); - default: - break; - } - return ""; +// switch (t) { +// case QAccessible::Value: +// case QAccessible::Name: +// //return data["text"].toString(); +// case QAccessible::Description: +// //return data["text"].toString() + " : " + data["group"].toString(); +// default: +// break; +// } + return QString(); } //Done void KItemListWidgetAccessible::setText(QAccessible::Text /*t*/, int child, const QString &text) { Q_ASSERT(child == 0); - (widget->data())["text"]=QVariant(text); + // FIXME - is this even allowed on the KItemListWidget? } //Done diff --git a/src/kitemviews/kitemlistviewaccessible.h b/src/kitemviews/kitemlistviewaccessible.h index 15391c601..9e26821b9 100644 --- a/src/kitemviews/kitemlistviewaccessible.h +++ b/src/kitemviews/kitemlistviewaccessible.h @@ -152,9 +152,8 @@ public: { return index; } private: - QPointer view; + QPointer view; int index; - KItemListWidget *widget; friend class KItemListViewAccessible; //friend class QAccessibleTree; -- 2.47.3