diff options
| author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-12-08 13:16:22 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-09 10:17:55 +0100 |
| commit | 6651e4fae3ee7d4c304ce67d32b211d691d32556 (patch) | |
| tree | 5a01dd0785ba8964b5610cfd28159d7d5c4a7622 /src/plugins/accessible | |
| parent | 12dffdae75996d154ba004d9515d4bf3ff4112c8 (diff) | |
Do not assert on invalid model index.
No need to crash here, just warn.
This will happen when asking a table for out of range indexes.
Change-Id: Ida83604bd587390a3b54fbed68f98dab8038c757
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins/accessible')
| -rw-r--r-- | src/plugins/accessible/widgets/itemviews.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp index d883468d00..b33260099f 100644 --- a/src/plugins/accessible/widgets/itemviews.cpp +++ b/src/plugins/accessible/widgets/itemviews.cpp @@ -224,7 +224,6 @@ QAccessibleInterface *QAccessibleTable::cellAt(int row, int column) const { Q_ASSERT(role() != QAccessible::Tree); QModelIndex index = view->model()->index(row, column); - //Q_ASSERT(index.isValid()); if (!index.isValid()) { qWarning() << "QAccessibleTable::cellAt: invalid index: " << index << " for " << view; return 0; @@ -623,7 +622,8 @@ bool QAccessibleTree::selectRow(int row) QAccessibleTableCell::QAccessibleTableCell(QAbstractItemView *view_, const QModelIndex &index_, QAccessible::Role role_) : /* QAccessibleSimpleEditableTextInterface(this), */ view(view_), m_index(index_), m_role(role_) { - Q_ASSERT(index_.isValid()); + if (!index_.isValid()) + qWarning() << "QAccessibleTableCell::QAccessibleTableCell with invalid index: " << index_; } void *QAccessibleTableCell::interface_cast(QAccessible::InterfaceType t) @@ -797,10 +797,6 @@ void QAccessibleTableCell::setText(QAccessible::Text /*t*/, const QString &text) bool QAccessibleTableCell::isValid() const { - if (!m_index.isValid()) { - qDebug() << "Interface is not valid"; - } - return m_index.isValid(); } |