summaryrefslogtreecommitdiffstats
path: root/src/plugins/accessible/widgets
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>2012-03-07 20:48:06 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-12 13:14:05 +0100
commit61692bfefec3f15a2be219bdb29893872a7feadf (patch)
tree484f6ef888373149432698f6acd26373bb6cdd2f /src/plugins/accessible/widgets
parent4eeb07d886940087de85ba1c4a12e634f35d8d9d (diff)
Remove QAccessible2::TableModelChange.
This was never a good idea since it has issues: It doesn't really work with more than one update without the client fetching the data. The same is unlikely to work reliable since it involves two ipc roundtrips. Instead we should have an extended QAccessibleEvent that contains the data so that the bridges can decide how to pass on the data if needed. Change-Id: Iaf6b74f49586f7155909a6fe1a17137b71b31175 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/plugins/accessible/widgets')
-rw-r--r--src/plugins/accessible/widgets/itemviews.cpp64
-rw-r--r--src/plugins/accessible/widgets/itemviews.h11
2 files changed, 0 insertions, 75 deletions
diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp
index a9f3a858d2..a2fe2cb7fd 100644
--- a/src/plugins/accessible/widgets/itemviews.cpp
+++ b/src/plugins/accessible/widgets/itemviews.cpp
@@ -156,63 +156,6 @@ QHeaderView *QAccessibleTable::verticalHeader() const
return header;
}
-void QAccessibleTable::modelReset()
-{}
-
-void QAccessibleTable::rowsInserted(const QModelIndex &, int first, int last)
-{
- lastChange.firstRow = first;
- lastChange.lastRow = last;
- lastChange.firstColumn = 0;
- lastChange.lastColumn = 0;
- lastChange.type = QAccessible2::TableModelChangeInsert;
-}
-
-void QAccessibleTable::rowsRemoved(const QModelIndex &, int first, int last)
-{
- lastChange.firstRow = first;
- lastChange.lastRow = last;
- lastChange.firstColumn = 0;
- lastChange.lastColumn = 0;
- lastChange.type = QAccessible2::TableModelChangeDelete;
-}
-
-void QAccessibleTable::columnsInserted(const QModelIndex &, int first, int last)
-{
- lastChange.firstRow = 0;
- lastChange.lastRow = 0;
- lastChange.firstColumn = first;
- lastChange.lastColumn = last;
- lastChange.type = QAccessible2::TableModelChangeInsert;
-}
-
-void QAccessibleTable::columnsRemoved(const QModelIndex &, int first, int last)
-{
- lastChange.firstRow = 0;
- lastChange.lastRow = 0;
- lastChange.firstColumn = first;
- lastChange.lastColumn = last;
- lastChange.type = QAccessible2::TableModelChangeDelete;
-}
-
-void QAccessibleTable::rowsMoved( const QModelIndex &, int, int, const QModelIndex &, int)
-{
- lastChange.firstRow = 0;
- lastChange.lastRow = 0;
- lastChange.firstColumn = 0;
- lastChange.lastColumn = 0;
- lastChange.type = QAccessible2::TableModelChangeUpdate;
-}
-
-void QAccessibleTable::columnsMoved( const QModelIndex &, int, int, const QModelIndex &, int)
-{
- lastChange.firstRow = 0;
- lastChange.lastRow = 0;
- lastChange.firstColumn = 0;
- lastChange.lastColumn = 0;
- lastChange.type = QAccessible2::TableModelChangeUpdate;
-}
-
QAccessibleTableCell *QAccessibleTable::cell(const QModelIndex &index) const
{
if (index.isValid())
@@ -349,13 +292,6 @@ bool QAccessibleTable::unselectColumn(int column)
return true;
}
-QAccessible2::TableModelChange QAccessibleTable::modelChange() const
-{
- QAccessible2::TableModelChange change;
- // FIXME
- return change;
-}
-
QAccessible::Role QAccessibleTable::role() const
{
return m_role;
diff --git a/src/plugins/accessible/widgets/itemviews.h b/src/plugins/accessible/widgets/itemviews.h
index 3d852a2377..2672cd4a16 100644
--- a/src/plugins/accessible/widgets/itemviews.h
+++ b/src/plugins/accessible/widgets/itemviews.h
@@ -88,7 +88,6 @@ public:
virtual QString rowDescription(int row) const;
virtual int columnCount() const;
virtual int rowCount() const;
- virtual QAccessible2::TableModelChange modelChange() const;
// selection
virtual int selectedCellCount() const;
@@ -105,17 +104,7 @@ public:
virtual bool unselectColumn(int column);
protected:
- virtual void modelReset();
- virtual void rowsInserted(const QModelIndex &parent, int first, int last);
- virtual void rowsRemoved(const QModelIndex &parent, int first, int last);
- virtual void columnsInserted(const QModelIndex &parent, int first, int last);
- virtual void columnsRemoved(const QModelIndex &parent, int first, int last);
- virtual void rowsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row);
- virtual void columnsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column);
-
-protected:
QAbstractItemView* view;
- QAccessible2::TableModelChange lastChange;
inline QAccessibleTableCell *cell(const QModelIndex &index) const;
inline QAccessible::Role cellRole() const {
switch (m_role) {