whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accessibility: Use new updateAccessibility() API in widgets. 

Change-Id: Id69cc28a54abc675a991f2c657a446f38313ac6e
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
bb10
Friedemann Kleint 2012-02-01 10:00:06 +01:00 committed by Qt by Nokia
parent 7518adbb13
commit e33e761bb5
22 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/dialogs/qdialog.cpp
View File

@ -748,7 +748,7 @@ void QDialog::setVisible(bool visible)
}
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::DialogStart);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::DialogStart, this, 0));
#endif
} else {
@ -757,7 +757,7 @@ void QDialog::setVisible(bool visible)
#ifndef QT_NO_ACCESSIBILITY
if (isVisible())
QAccessible::updateAccessibility(this, 0, QAccessible::DialogEnd);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::DialogEnd, this, 0));
#endif
// Reimplemented to exit a modal event loop when the dialog is hidden.

2
src/widgets/dialogs/qmessagebox.cpp
View File

@ -1463,7 +1463,7 @@ void QMessageBox::showEvent(QShowEvent *e)
d->updateSize();
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::Alert);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Alert, this, 0));
#endif
#ifdef Q_OS_WIN
if (const HMENU systemMenu = qt_getWindowsSystemMenu(this)) {

2
src/widgets/graphicsview/qgraphicsscene.cpp
View File

@ -843,7 +843,7 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item,
#ifndef QT_NO_ACCESSIBILITY
if (focusItem) {
if (QGraphicsObject *focusObj = focusItem->toGraphicsObject()) {
QAccessible::updateAccessibility(focusObj, 0, QAccessible::Focus);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, focusObj, 0));
}
}
#endif

12
src/widgets/itemviews/qabstractitemview.cpp
View File

@ -1112,7 +1112,7 @@ void QAbstractItemView::reset()
#ifdef Q_WS_X11
if (QAccessible::isActive()) {
QAccessible::queryAccessibleInterface(this)->table2Interface()->modelReset();
QAccessible::updateAccessibility(this, 0, QAccessible::TableModelChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TableModelChanged, this, 0));
}
#endif
#endif
@ -3342,7 +3342,7 @@ void QAbstractItemViewPrivate::_q_rowsRemoved(const QModelIndex &index, int star
#ifdef Q_WS_X11
if (QAccessible::isActive()) {
QAccessible::queryAccessibleInterface(q)->table2Interface()->rowsRemoved(index, start, end);
QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TableModelChanged, q, 0));
}
#endif
#endif
@ -3422,7 +3422,7 @@ void QAbstractItemViewPrivate::_q_columnsRemoved(const QModelIndex &index, int s
#ifdef Q_WS_X11
if (QAccessible::isActive()) {
QAccessible::queryAccessibleInterface(q)->table2Interface()->columnsRemoved(index, start, end);
QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TableModelChanged, q, 0));
}
#endif
#endif
@ -3445,7 +3445,7 @@ void QAbstractItemViewPrivate::_q_rowsInserted(const QModelIndex &index, int sta
Q_Q(QAbstractItemView);
if (QAccessible::isActive()) {
QAccessible::queryAccessibleInterface(q)->table2Interface()->rowsInserted(index, start, end);
QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TableModelChanged, q, 0));
}
#endif
#endif
@ -3469,7 +3469,7 @@ void QAbstractItemViewPrivate::_q_columnsInserted(const QModelIndex &index, int
#ifdef Q_WS_X11
if (QAccessible::isActive()) {
QAccessible::queryAccessibleInterface(q)->table2Interface()->columnsInserted(index, start, end);
QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TableModelChanged, q, 0));
}
#endif
#endif
@ -3497,7 +3497,7 @@ void QAbstractItemViewPrivate::_q_layoutChanged()
Q_Q(QAbstractItemView);
if (QAccessible::isActive()) {
QAccessible::queryAccessibleInterface(q)->table2Interface()->modelReset();
QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TableModelChanged, q, 0));
}
#endif
#endif

6
src/widgets/itemviews/qlistview.cpp
View File

@ -3169,7 +3169,7 @@ void QListView::currentChanged(const QModelIndex &current, const QModelIndex &pr
if (QAccessible::isActive()) {
if (current.isValid()) {
int entry = visualIndex(current) + 1;
QAccessible::updateAccessibility(this, entry, QAccessible::Focus);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, this, entry));
}
}
#endif
@ -3188,12 +3188,12 @@ void QListView::selectionChanged(const QItemSelection &selected,
QModelIndex sel = selected.indexes().value(0);
if (sel.isValid()) {
int entry = visualIndex(sel) + 1;
QAccessible::updateAccessibility(this, entry, QAccessible::Selection);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Selection, this, entry));
}
QModelIndex desel = deselected.indexes().value(0);
if (desel.isValid()) {
int entry = visualIndex(desel) + 1;
QAccessible::updateAccessibility(this, entry, QAccessible::SelectionRemove);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::SelectionRemove, this, entry));
}
}
#endif

12
src/widgets/itemviews/qtableview.cpp
View File

@ -3167,12 +3167,12 @@ void QTableView::currentChanged(const QModelIndex &current, const QModelIndex &p
#ifdef Q_OS_UNIX
Q_D(QTableView);
int entry = d->accessibleTable2Index(current);
QAccessible::updateAccessibility(this, entry, QAccessible::Focus);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, this, entry));
#else
int entry = visualIndex(current) + 1;
if (horizontalHeader())
++entry;
QAccessible::updateAccessibility(viewport(), entry, QAccessible::Focus);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, viewport(), entry));
#endif
}
}
@ -3195,24 +3195,24 @@ void QTableView::selectionChanged(const QItemSelection &selected,
if (sel.isValid()) {
#ifdef Q_OS_UNIX
int entry = d->accessibleTable2Index(sel);
QAccessible::updateAccessibility(this, entry, QAccessible::Selection);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Selection, this, entry));
#else
int entry = visualIndex(sel);
if (horizontalHeader())
++entry;
QAccessible::updateAccessibility(viewport(), entry, QAccessible::Selection);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Selection, viewport(), entry));
#endif
}
QModelIndex desel = deselected.indexes().value(0);
if (desel.isValid()) {
#ifdef Q_OS_UNIX
int entry = d->accessibleTable2Index(desel);
QAccessible::updateAccessibility(this, entry, QAccessible::SelectionRemove);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::SelectionRemove, this, entry));
#else
int entry = visualIndex(sel);
if (horizontalHeader())
++entry;
QAccessible::updateAccessibility(viewport(), entry, QAccessible::SelectionRemove);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::SelectionRemove, viewport(), entry));
#endif
}
}

10
src/widgets/itemviews/qtreeview.cpp
View File

@ -2937,7 +2937,7 @@ void QTreeViewPrivate::insertViewItems(int pos, int count, const QTreeViewItem &
#ifndef QT_NO_ACCESSIBILITY
#ifdef Q_OS_UNIX
if (QAccessible::isActive()) {
QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TableModelChanged, q, 0));
}
#endif
#endif
@ -2955,7 +2955,7 @@ void QTreeViewPrivate::removeViewItems(int pos, int count)
#ifndef QT_NO_ACCESSIBILITY
#ifdef Q_OS_UNIX
if (QAccessible::isActive()) {
QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TableModelChanged, q, 0));
}
#endif
#endif
@ -3769,7 +3769,7 @@ void QTreeView::currentChanged(const QModelIndex &current, const QModelIndex &pr
if (QAccessible::isActive() && current.isValid()) {
#ifdef Q_OS_UNIX
int entry = (visualIndex(current) + (header()?1:0))*current.model()->columnCount()+current.column() + 1;
QAccessible::updateAccessibility(this, entry, QAccessible::Focus);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, this, entry));
#else
int entry = visualIndex(current) + 1;
if (header())
@ -3794,13 +3794,13 @@ void QTreeView::selectionChanged(const QItemSelection &selected,
if (sel.isValid()) {
int entry = (visualIndex(sel) + (header()?1:0))*sel.model()->columnCount()+sel.column() + 1;
Q_ASSERT(entry > 0);
QAccessible::updateAccessibility(this, entry, QAccessible::Selection);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Selection, this, entry));
}
QModelIndex desel = deselected.indexes().value(0);
if (desel.isValid()) {
int entry = (visualIndex(desel) + (header()?1:0))*desel.model()->columnCount()+desel.column() + 1;
Q_ASSERT(entry > 0);
QAccessible::updateAccessibility(this, entry, QAccessible::SelectionRemove);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::SelectionRemove, this, entry));
}
}
#endif

4
src/widgets/kernel/qwhatsthis.cpp
View File

@ -411,7 +411,7 @@ QWhatsThisPrivate::QWhatsThisPrivate()
#endif
}
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::ContextHelpStart);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::ContextHelpStart, this, 0));
#endif
}
@ -423,7 +423,7 @@ QWhatsThisPrivate::~QWhatsThisPrivate()
QApplication::restoreOverrideCursor();
#endif
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::ContextHelpEnd);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::ContextHelpEnd, this, 0));
#endif
instance = 0;
}

18
src/widgets/kernel/qwidget.cpp
View File

@ -5987,7 +5987,7 @@ void QWidget::setFocus(Qt::FocusReason reason)
// menus update the focus manually and this would create bogus events
if (!(f->inherits("QMenuBar") || f->inherits("QMenu") || f->inherits("QMenuItem")))
# endif
QAccessible::updateAccessibility(f, 0, QAccessible::Focus);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, f, 0));
#endif
#ifndef QT_NO_GRAPHICSVIEW
if (QWExtra *topData = window()->d_func()->extra) {
@ -6067,7 +6067,7 @@ void QWidget::clearFocus()
#endif
{
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::Focus);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, this, 0));
#endif
}
}
@ -7074,7 +7074,7 @@ void QWidgetPrivate::show_helper()
#ifndef QT_NO_ACCESSIBILITY
if (q->windowType() != Qt::ToolTip) // Tooltips are read aloud twice in MS narrator.
QAccessible::updateAccessibility(q, 0, QAccessible::ObjectShow);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::ObjectShow, q, 0));
#endif
if (QApplicationPrivate::hidden_focus_widget == q) {
@ -7165,7 +7165,7 @@ void QWidgetPrivate::hide_helper()
#ifndef QT_NO_ACCESSIBILITY
if (wasVisible)
QAccessible::updateAccessibility(q, 0, QAccessible::ObjectHide);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::ObjectHide, q, 0));
#endif
}
@ -7400,7 +7400,7 @@ void QWidgetPrivate::hideChildren(bool spontaneous)
qApp->d_func()->sendSyntheticEnterLeave(widget);
#ifndef QT_NO_ACCESSIBILITY
if (!spontaneous)
QAccessible::updateAccessibility(widget, 0, QAccessible::ObjectHide);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::ObjectHide, widget, 0));
#endif
}
}
@ -8254,7 +8254,7 @@ void QWidget::changeEvent(QEvent * event)
case QEvent::EnabledChange:
update();
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::StateChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::StateChanged, this, 0));
#endif
break;
@ -10386,7 +10386,7 @@ void QWidget::setAccessibleName(const QString &name)
{
Q_D(QWidget);
d->accessibleName = name;
QAccessible::updateAccessibility(this, 0, QAccessible::NameChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::NameChanged, this, 0));
}
QString QWidget::accessibleName() const
@ -10408,7 +10408,7 @@ void QWidget::setAccessibleDescription(const QString &description)
{
Q_D(QWidget);
d->accessibleDescription = description;
QAccessible::updateAccessibility(this, 0, QAccessible::DescriptionChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::DescriptionChanged, this, 0));
}
QString QWidget::accessibleDescription() const
@ -10521,7 +10521,7 @@ void QWidget::updateMicroFocus()
#ifndef QT_NO_ACCESSIBILITY
if (isVisible()) {
// ##### is this correct
QAccessible::updateAccessibility(this, 0, QAccessible::StateChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::StateChanged, this, 0));
}
#endif
}

4
src/widgets/widgets/qabstractbutton.cpp
View File

@ -503,7 +503,7 @@ void QAbstractButtonPrivate::refresh()
return;
q->update();
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(q, 0, QAccessible::StateChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::StateChanged, q, 0));
#endif
}
@ -645,7 +645,7 @@ void QAbstractButton::setText(const QString &text)
update();
updateGeometry();
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::NameChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::NameChanged, this, 0));
#endif
}

2
src/widgets/widgets/qabstractslider.cpp
View File

@ -538,7 +538,7 @@ void QAbstractSlider::setValue(int value)
emit sliderMoved((d->position = value));
}
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::ValueChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::ValueChanged, this, 0));
#endif
sliderChange(SliderValueChange);
emit valueChanged(value);

4
src/widgets/widgets/qabstractspinbox.cpp
View File

@ -976,7 +976,7 @@ void QAbstractSpinBox::keyPressEvent(QKeyEvent *event)
}
}
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::ValueChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::ValueChanged, this, 0));
#endif
return;
}
@ -1595,7 +1595,7 @@ void QAbstractSpinBoxPrivate::updateState(bool up, bool fromKeyboard /* = false
buttonState = (up ? Up : Down) | (fromKeyboard ? Keyboard : Mouse);
q->stepBy(up ? 1 : -1);
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(q, 0, QAccessible::ValueChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::ValueChanged, q, 0));
#endif
}
}

10
src/widgets/widgets/qcombobox.cpp
View File

@ -987,7 +987,7 @@ void QComboBoxPrivate::_q_dataChanged(const QModelIndex &topLeft, const QModelIn
q->update();
}
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(q, 0, QAccessible::NameChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::NameChanged, q, 0));
#endif
}
@ -1243,7 +1243,7 @@ void QComboBoxPrivate::_q_emitCurrentIndexChanged(const QModelIndex &index)
emit q->currentIndexChanged(index.row());
emit q->currentIndexChanged(itemText(index));
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(q, 0, QAccessible::NameChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::NameChanged, q, 0));
#endif
}
@ -2583,7 +2583,7 @@ void QComboBox::clear()
Q_D(QComboBox);
d->model->removeRows(0, d->model->rowCount(d->root), d->root);
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::NameChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::NameChanged, this, 0));
#endif
}
@ -2602,7 +2602,7 @@ void QComboBox::clearEditText()
if (d->lineEdit)
d->lineEdit->clear();
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::NameChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::NameChanged, this, 0));
#endif
}
@ -2615,7 +2615,7 @@ void QComboBox::setEditText(const QString &text)
if (d->lineEdit)
d->lineEdit->setText(text);
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::NameChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::NameChanged, this, 0));
#endif
}

2
src/widgets/widgets/qgroupbox.cpp
View File

@ -249,7 +249,7 @@ void QGroupBox::setTitle(const QString &title)
update();
updateGeometry();
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::NameChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::NameChanged, this, 0));
#endif
}

2
src/widgets/widgets/qlabel.cpp
View File

@ -316,7 +316,7 @@ void QLabel::setText(const QString &text)
#ifndef QT_NO_ACCESSIBILITY
if (accessibleName().isEmpty())
QAccessible::updateAccessibility(this, 0, QAccessible::NameChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::NameChanged, this, 0));
#endif
}

2
src/widgets/widgets/qlineedit_p.cpp
View File

@ -144,7 +144,7 @@ void QLineEditPrivate::_q_selectionChanged()
emit q->selectionChanged();
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(q, 0, QAccessible::TextSelectionChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TextSelectionChanged, q, 0));
#endif
}

8
src/widgets/widgets/qmenu.cpp
View File

@ -1085,8 +1085,8 @@ void QMenuPrivate::activateAction(QAction *action, QAction::ActionEvent action_e
#ifndef QT_NO_ACCESSIBILITY
if (QAccessible::isActive()) {
int actionIndex = indexOf(action) + 1;
QAccessible::updateAccessibility(q, actionIndex, QAccessible::Focus);
QAccessible::updateAccessibility(q, actionIndex, QAccessible::Selection);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, q, actionIndex));
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Selection, q, actionIndex));
}
#endif
action->showStatusText(topCausedWidget());
@ -1971,7 +1971,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
}
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::PopupMenuStart);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::PopupMenuStart, this ,0));
#endif
}
@ -2117,7 +2117,7 @@ void QMenu::hideEvent(QHideEvent *)
d->eventLoop->exit();
d->setCurrentAction(0);
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::PopupMenuEnd);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::PopupMenuEnd, this, 0));
#endif
#ifndef QT_NO_MENUBAR
if (QMenuBar *mb = qobject_cast<QMenuBar*>(d->causedPopup.widget))

4
src/widgets/widgets/qmenubar.cpp
View File

@ -531,8 +531,8 @@ void QMenuBarPrivate::_q_actionHovered()
if (QAccessible::isActive()) {
int actionIndex = actions.indexOf(action);
++actionIndex;
QAccessible::updateAccessibility(q, actionIndex, QAccessible::Focus);
QAccessible::updateAccessibility(q, actionIndex, QAccessible::Selection);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, q, actionIndex));
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Selection, q, actionIndex));
}
#endif //QT_NO_ACCESSIBILITY
}

2
src/widgets/widgets/qprogressbar.cpp
View File

@ -314,7 +314,7 @@ void QProgressBar::setValue(int value)
d->value = value;
emit valueChanged(value);
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::ValueChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::ValueChanged, this, 0));
#endif
if (d->repaintRequired())
repaint();

2
src/widgets/widgets/qpushbutton.cpp
View File

@ -376,7 +376,7 @@ void QPushButton::setDefault(bool enable)
}
update();
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(this, 0, QAccessible::StateChanged);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::StateChanged, this, 0));
#endif
}

4
src/widgets/widgets/qtabbar.cpp
View File

@ -1183,8 +1183,8 @@ void QTabBar::setCurrentIndex(int index)
d->layoutTab(index);
#ifndef QT_NO_ACCESSIBILITY
if (QAccessible::isActive()) {
QAccessible::updateAccessibility(this, index + 1, QAccessible::Focus);
QAccessible::updateAccessibility(this, index + 1, QAccessible::Selection);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, this, index + 1));
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Selection, this, index + 1));
}
#endif
emit currentChanged(index);

4
src/widgets/widgets/qwidgetlinecontrol.cpp
View File

@ -758,7 +758,7 @@ void QWidgetLineControl::internalSetText(const QString &txt, int pos, bool edite
#ifndef QT_NO_ACCESSIBILITY
if (changed)
QAccessible::updateAccessibility(parent(), 0, QAccessible::TextUpdated);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TextUpdated, parent(), 0));
#endif
}
@ -1357,7 +1357,7 @@ void QWidgetLineControl::emitCursorPositionChanged()
m_lastCursorPos = m_cursor;
cursorPositionChanged(oldLast, m_cursor);
#ifndef QT_NO_ACCESSIBILITY
QAccessible::updateAccessibility(parent(), 0, QAccessible::TextCaretMoved);
QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TextCaretMoved, parent(), 0));
#endif
}
}