diff options
Diffstat (limited to 'src')
25 files changed, 112 insertions, 113 deletions
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index 561aa83142..7b1da21095 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -648,7 +648,8 @@ void QAccessible::setRootObject(QObject *object) void QAccessible::updateAccessibility(QObject *object, int child, Event reason) { Q_ASSERT(object); - QAccessibleEvent ev(reason, object, child); + + QAccessibleEvent ev(object, reason); updateAccessibility(&ev); } diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index a5ec8071b8..91726f194b 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -434,8 +434,8 @@ class Q_GUI_EXPORT QAccessibleEvent { Q_DISABLE_COPY(QAccessibleEvent) public: - inline QAccessibleEvent(QAccessible::Event typ, QObject *obj, int chld = -1) - : m_type(typ), m_object(obj), m_child(chld) + inline QAccessibleEvent(QObject *obj, QAccessible::Event typ) + : m_type(typ), m_object(obj), m_child(-1) { Q_ASSERT(obj); // All events below have a subclass of QAccessibleEvent. @@ -454,6 +454,8 @@ public: QAccessible::Event type() const { return m_type; } QObject *object() const { return m_object; } + + void setChild(int chld) { m_child = chld; } int child() const { return m_child; } QAccessibleInterface *accessibleInterface() const; @@ -467,8 +469,8 @@ protected: class Q_GUI_EXPORT QAccessibleStateChangeEvent :public QAccessibleEvent { public: - inline QAccessibleStateChangeEvent(QAccessible::State state, QObject *obj, int chld = -1) - : QAccessibleEvent(QAccessible::InvalidEvent, obj, chld), m_changedStates(state) + inline QAccessibleStateChangeEvent(QObject *obj, QAccessible::State state) + : QAccessibleEvent(obj, QAccessible::InvalidEvent), m_changedStates(state) { m_type = QAccessible::StateChanged; } @@ -485,8 +487,8 @@ protected: class Q_GUI_EXPORT QAccessibleTextCursorEvent : public QAccessibleEvent { public: - inline QAccessibleTextCursorEvent(int cursorPos, QObject *obj, int chld = -1) - : QAccessibleEvent(QAccessible::InvalidEvent, obj, chld) + inline QAccessibleTextCursorEvent(QObject *obj, int cursorPos) + : QAccessibleEvent(obj, QAccessible::InvalidEvent) , m_cursorPosition(cursorPos) { m_type = QAccessible::TextCaretMoved; @@ -503,8 +505,8 @@ protected: class Q_GUI_EXPORT QAccessibleTextSelectionEvent : public QAccessibleTextCursorEvent { public: - inline QAccessibleTextSelectionEvent(int start, int end, QObject *obj, int chld = -1) - : QAccessibleTextCursorEvent((start == -1) ? 0 : end, obj, chld) + inline QAccessibleTextSelectionEvent(QObject *obj, int start, int end) + : QAccessibleTextCursorEvent(obj, (start == -1) ? 0 : end) , m_selectionStart(start), m_selectionEnd(end) { m_type = QAccessible::TextSelectionChanged; @@ -526,8 +528,8 @@ protected: class Q_GUI_EXPORT QAccessibleTextInsertEvent : public QAccessibleTextCursorEvent { public: - inline QAccessibleTextInsertEvent(int position, const QString &text, QObject *obj, int chld = -1) - : QAccessibleTextCursorEvent(position + text.length(), obj, chld) + inline QAccessibleTextInsertEvent(QObject *obj, int position, const QString &text) + : QAccessibleTextCursorEvent(obj, position + text.length()) , m_position(position), m_text(text) { m_type = QAccessible::TextInserted; @@ -548,8 +550,8 @@ protected: class Q_GUI_EXPORT QAccessibleTextRemoveEvent : public QAccessibleTextCursorEvent { public: - inline QAccessibleTextRemoveEvent(int position, const QString &text, QObject *obj, int chld = -1) - : QAccessibleTextCursorEvent(position, obj, chld) + inline QAccessibleTextRemoveEvent(QObject *obj, int position, const QString &text) + : QAccessibleTextCursorEvent(obj, position) , m_position(position), m_text(text) { m_type = QAccessible::TextRemoved; @@ -570,8 +572,8 @@ protected: class Q_GUI_EXPORT QAccessibleTextUpdateEvent : public QAccessibleTextCursorEvent { public: - inline QAccessibleTextUpdateEvent(int position, const QString &oldText, const QString &text, QObject *obj, int chld = -1) - : QAccessibleTextCursorEvent(position + text.length(), obj, chld) + inline QAccessibleTextUpdateEvent(QObject *obj, int position, const QString &oldText, const QString &text) + : QAccessibleTextCursorEvent(obj, position + text.length()) , m_position(position), m_oldText(oldText), m_text(text) { m_type = QAccessible::TextUpdated; @@ -595,8 +597,8 @@ protected: class Q_GUI_EXPORT QAccessibleValueChangeEvent : public QAccessibleEvent { public: - inline QAccessibleValueChangeEvent(const QVariant &val, QObject *obj, int chld = -1) - : QAccessibleEvent(QAccessible::InvalidEvent, obj, chld) + inline QAccessibleValueChangeEvent(QObject *obj, const QVariant &val) + : QAccessibleEvent(obj, QAccessible::InvalidEvent) , m_value(val) { m_type = QAccessible::ValueChanged; diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h index fa2718b1b7..e039cd3998 100644 --- a/src/testlib/qtestaccessible.h +++ b/src/testlib/qtestaccessible.h @@ -183,35 +183,39 @@ private: } static QAccessibleEvent *copyEvent(QAccessibleEvent *event) { + QAccessibleEvent *ev; if (event->type() == QAccessible::StateChanged) { - return new QAccessibleStateChangeEvent(static_cast<QAccessibleStateChangeEvent*>(event)->changedStates(), - event->object(), event->child()); + ev = new QAccessibleStateChangeEvent(event->object(), + static_cast<QAccessibleStateChangeEvent*>(event)->changedStates()); } else if (event->type() == QAccessible::TextCaretMoved) { - return new QAccessibleTextCursorEvent(static_cast<QAccessibleTextCursorEvent*>(event)->cursorPosition(), event->object(), event->child()); + ev = new QAccessibleTextCursorEvent(event->object(), static_cast<QAccessibleTextCursorEvent*>(event)->cursorPosition()); } else if (event->type() == QAccessible::TextSelectionChanged) { const QAccessibleTextSelectionEvent *original = static_cast<QAccessibleTextSelectionEvent*>(event); - QAccessibleTextSelectionEvent *ev = new QAccessibleTextSelectionEvent(original->selectionStart(), original->selectionEnd(), event->object(), event->child()); - ev->setCursorPosition(original->cursorPosition()); - return ev; + QAccessibleTextSelectionEvent *sel = new QAccessibleTextSelectionEvent(event->object(), original->selectionStart(), original->selectionEnd()); + sel->setCursorPosition(original->cursorPosition()); + ev = sel; } else if (event->type() == QAccessible::TextInserted) { const QAccessibleTextInsertEvent *original = static_cast<QAccessibleTextInsertEvent*>(event); - QAccessibleTextInsertEvent *ev = new QAccessibleTextInsertEvent(original->changePosition(), original->textInserted(), event->object(), event->child()); - ev->setCursorPosition(original->cursorPosition()); - return ev; + QAccessibleTextInsertEvent *ins = new QAccessibleTextInsertEvent(event->object(), original->changePosition(), original->textInserted()); + ins->setCursorPosition(original->cursorPosition()); + ev = ins; } else if (event->type() == QAccessible::TextRemoved) { const QAccessibleTextRemoveEvent *original = static_cast<QAccessibleTextRemoveEvent*>(event); - QAccessibleTextRemoveEvent *ev = new QAccessibleTextRemoveEvent(original->changePosition(), original->textRemoved(), event->object(), event->child()); - ev->setCursorPosition(original->cursorPosition()); - return ev; + QAccessibleTextRemoveEvent *rem = new QAccessibleTextRemoveEvent(event->object(), original->changePosition(), original->textRemoved()); + rem->setCursorPosition(original->cursorPosition()); + ev = rem; } else if (event->type() == QAccessible::TextUpdated) { const QAccessibleTextUpdateEvent *original = static_cast<QAccessibleTextUpdateEvent*>(event); - QAccessibleTextUpdateEvent *ev = new QAccessibleTextUpdateEvent(original->changePosition(), original->textRemoved(), original->textInserted(), event->object(), event->child()); - ev->setCursorPosition(original->cursorPosition()); - return ev; + QAccessibleTextUpdateEvent *upd = new QAccessibleTextUpdateEvent(event->object(), original->changePosition(), original->textRemoved(), original->textInserted()); + upd->setCursorPosition(original->cursorPosition()); + ev = upd; } else if (event->type() == QAccessible::ValueChanged) { - return new QAccessibleValueChangeEvent(static_cast<QAccessibleValueChangeEvent*>(event)->value(), event->object(), event->child()); + ev = new QAccessibleValueChangeEvent(event->object(), static_cast<QAccessibleValueChangeEvent*>(event)->value()); + } else { + ev = new QAccessibleEvent(event->object(), event->type()); } - return new QAccessibleEvent(event->type(), event->object(), event->child()); + ev->setChild(event->child()); + return ev; } static EventList &eventList() diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 5d36bc07e8..df76d0af0e 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -754,7 +754,7 @@ void QDialog::setVisible(bool visible) } #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::DialogStart, this); + QAccessibleEvent event(this, QAccessible::DialogStart); QAccessible::updateAccessibility(&event); #endif @@ -764,7 +764,7 @@ void QDialog::setVisible(bool visible) #ifndef QT_NO_ACCESSIBILITY if (isVisible()) { - QAccessibleEvent event(QAccessible::DialogEnd, this); + QAccessibleEvent event(this, QAccessible::DialogEnd); QAccessible::updateAccessibility(&event); } #endif diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 040f61dfc5..ec24f09b77 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -1463,7 +1463,7 @@ void QMessageBox::showEvent(QShowEvent *e) d->updateSize(); #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::Alert, this); + QAccessibleEvent event(this, QAccessible::Alert); QAccessible::updateAccessibility(&event); #endif #ifdef Q_OS_WIN diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index 752542c1ee..8d1795c3c2 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -843,7 +843,7 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item, #ifndef QT_NO_ACCESSIBILITY if (focusItem) { if (QGraphicsObject *focusObj = focusItem->toGraphicsObject()) { - QAccessibleEvent event(QAccessible::Focus, focusObj); + QAccessibleEvent event(focusObj, QAccessible::Focus); QAccessible::updateAccessibility(&event); } } diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 8992a3bdfe..2ff039595a 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -1112,7 +1112,7 @@ void QAbstractItemView::reset() #ifdef Q_WS_X11 if (QAccessible::isActive()) { QAccessible::queryAccessibleInterface(this)->table2Interface()->modelReset(); - QAccessibleEvent event(QAccessible::TableModelChanged, this, 0); + QAccessibleEvent event(this, QAccessible::TableModelChanged); QAccessible::updateAccessibility(&event); } #endif diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp index 872798a8e9..4547dde6e1 100644 --- a/src/widgets/itemviews/qlistview.cpp +++ b/src/widgets/itemviews/qlistview.cpp @@ -3169,7 +3169,8 @@ void QListView::currentChanged(const QModelIndex ¤t, const QModelIndex &pr if (QAccessible::isActive()) { if (current.isValid()) { int entry = visualIndex(current) + 1; - QAccessibleEvent event(QAccessible::Focus, this, entry); + QAccessibleEvent event(this, QAccessible::Focus); + event.setChild(entry); QAccessible::updateAccessibility(&event); } } @@ -3189,13 +3190,15 @@ void QListView::selectionChanged(const QItemSelection &selected, QModelIndex sel = selected.indexes().value(0); if (sel.isValid()) { int entry = visualIndex(sel) + 1; - QAccessibleEvent event(QAccessible::Selection, this, entry); + QAccessibleEvent event(this, QAccessible::Selection); + event.setChild(entry); QAccessible::updateAccessibility(&event); } QModelIndex desel = deselected.indexes().value(0); if (desel.isValid()) { int entry = visualIndex(desel) + 1; - QAccessibleEvent event(QAccessible::SelectionRemove, this, entry); + QAccessibleEvent event(this, QAccessible::SelectionRemove); + event.setChild(entry); QAccessible::updateAccessibility(&event); } } diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp index 55cf18d78c..e997f7e9d6 100644 --- a/src/widgets/itemviews/qtableview.cpp +++ b/src/widgets/itemviews/qtableview.cpp @@ -3182,7 +3182,8 @@ void QTableView::currentChanged(const QModelIndex ¤t, const QModelIndex &p if (current.isValid()) { Q_D(QTableView); int entry = d->accessibleTable2Index(current); - QAccessibleEvent event(QAccessible::Focus, this, entry); + QAccessibleEvent event(this, QAccessible::Focus); + event.setChild(entry); QAccessible::updateAccessibility(&event); } } @@ -3204,13 +3205,15 @@ void QTableView::selectionChanged(const QItemSelection &selected, QModelIndex sel = selected.indexes().value(0); if (sel.isValid()) { int entry = d->accessibleTable2Index(sel); - QAccessibleEvent event(QAccessible::Selection, this, entry); + QAccessibleEvent event(this, QAccessible::Selection); + event.setChild(entry); QAccessible::updateAccessibility(&event); } QModelIndex desel = deselected.indexes().value(0); if (desel.isValid()) { int entry = d->accessibleTable2Index(desel); - QAccessibleEvent event(QAccessible::SelectionRemove, this, entry); + QAccessibleEvent event(this, QAccessible::SelectionRemove); + event.setChild(entry); QAccessible::updateAccessibility(&event); } } diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index 6166823754..acc485c371 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -2934,14 +2934,6 @@ void QTreeViewPrivate::insertViewItems(int pos, int count, const QTreeViewItem & for (int i = pos + count; i < viewItems.count(); i++) if (items[i].parentItem >= pos) items[i].parentItem += count; -#ifndef QT_NO_ACCESSIBILITY -#ifdef Q_OS_UNIX - if (QAccessible::isActive()) { - QAccessibleEvent event(QAccessible::TableModelChanged, q, 0); - QAccessible::updateAccessibility(&event); - } -#endif -#endif } void QTreeViewPrivate::removeViewItems(int pos, int count) @@ -2953,14 +2945,6 @@ void QTreeViewPrivate::removeViewItems(int pos, int count) for (int i = pos; i < viewItems.count(); i++) if (items[i].parentItem >= pos) items[i].parentItem -= count; -#ifndef QT_NO_ACCESSIBILITY -#ifdef Q_OS_UNIX - if (QAccessible::isActive()) { - QAccessibleEvent event(QAccessible::TableModelChanged, q, 0); - QAccessible::updateAccessibility(&event); - } -#endif -#endif } #if 0 @@ -3769,16 +3753,10 @@ void QTreeView::currentChanged(const QModelIndex ¤t, const QModelIndex &pr } #ifndef QT_NO_ACCESSIBILITY if (QAccessible::isActive() && current.isValid()) { -#ifdef Q_OS_UNIX int entry = (visualIndex(current) + (header()?1:0))*current.model()->columnCount()+current.column() + 1; - QAccessibleEvent event(QAccessible::Focus, this, entry); + QAccessibleEvent event(this, QAccessible::Focus); + event.setChild(entry); QAccessible::updateAccessibility(&event); -#else - int entry = visualIndex(current) + 1; - if (header()) - ++entry; - QAccessible::updateAccessibility(viewport(), entry, QAccessible::Focus); -#endif } #endif } @@ -3797,14 +3775,16 @@ 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); - QAccessibleEvent event(QAccessible::Selection, this, entry); + QAccessibleEvent event(this, QAccessible::Selection); + event.setChild(entry); QAccessible::updateAccessibility(&event); } 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); - QAccessibleEvent event(QAccessible::SelectionRemove, this, entry); + QAccessibleEvent event(this, QAccessible::SelectionRemove); + event.setChild(entry); QAccessible::updateAccessibility(&event); } } diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 114cde59e9..88c41a5fba 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -412,7 +412,7 @@ QWhatsThisPrivate::QWhatsThisPrivate() #endif } #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::ContextHelpStart, this); + QAccessibleEvent event(this, QAccessible::ContextHelpStart); QAccessible::updateAccessibility(&event); #endif } @@ -425,7 +425,7 @@ QWhatsThisPrivate::~QWhatsThisPrivate() QApplication::restoreOverrideCursor(); #endif #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::ContextHelpEnd, this); + QAccessibleEvent event(this, QAccessible::ContextHelpEnd); QAccessible::updateAccessibility(&event); #endif instance = 0; diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 1bf3d3cff9..6418ba63e1 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -5967,7 +5967,7 @@ void QWidget::setFocus(Qt::FocusReason reason) if (!(f->inherits("QMenuBar") || f->inherits("QMenu") || f->inherits("QMenuItem"))) # endif { - QAccessibleEvent event(QAccessible::Focus, f); + QAccessibleEvent event(f, QAccessible::Focus); QAccessible::updateAccessibility(&event); } #endif @@ -6049,7 +6049,7 @@ void QWidget::clearFocus() #endif { #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::Focus, this); + QAccessibleEvent event(this, QAccessible::Focus); QAccessible::updateAccessibility(&event); #endif } @@ -7057,7 +7057,7 @@ void QWidgetPrivate::show_helper() #ifndef QT_NO_ACCESSIBILITY if (q->windowType() != Qt::ToolTip) { // Tooltips are read aloud twice in MS narrator. - QAccessibleEvent event(QAccessible::ObjectShow, q); + QAccessibleEvent event(q, QAccessible::ObjectShow); QAccessible::updateAccessibility(&event); } #endif @@ -7150,7 +7150,7 @@ void QWidgetPrivate::hide_helper() #ifndef QT_NO_ACCESSIBILITY if (wasVisible) { - QAccessibleEvent event(QAccessible::ObjectHide, q); + QAccessibleEvent event(q, QAccessible::ObjectHide); QAccessible::updateAccessibility(&event); } #endif @@ -7384,7 +7384,7 @@ void QWidgetPrivate::hideChildren(bool spontaneous) qApp->d_func()->sendSyntheticEnterLeave(widget); #ifndef QT_NO_ACCESSIBILITY if (!spontaneous) { - QAccessibleEvent event(QAccessible::ObjectHide, widget); + QAccessibleEvent event(widget, QAccessible::ObjectHide); QAccessible::updateAccessibility(&event); } #endif @@ -8261,7 +8261,7 @@ void QWidget::changeEvent(QEvent * event) #ifndef QT_NO_ACCESSIBILITY QAccessible::State s; s.disabled = true; - QAccessibleStateChangeEvent event(s, this); + QAccessibleStateChangeEvent event(this, s); QAccessible::updateAccessibility(&event); #endif break; @@ -10403,7 +10403,7 @@ void QWidget::setAccessibleName(const QString &name) { Q_D(QWidget); d->accessibleName = name; - QAccessibleEvent event(QAccessible::NameChanged, this); + QAccessibleEvent event(this, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); } @@ -10426,7 +10426,7 @@ void QWidget::setAccessibleDescription(const QString &description) { Q_D(QWidget); d->accessibleDescription = description; - QAccessibleEvent event(QAccessible::DescriptionChanged, this); + QAccessibleEvent event(this, QAccessible::DescriptionChanged); QAccessible::updateAccessibility(&event); } diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp index 0b24799a56..8c0bcc098f 100644 --- a/src/widgets/widgets/qabstractbutton.cpp +++ b/src/widgets/widgets/qabstractbutton.cpp @@ -644,7 +644,7 @@ void QAbstractButton::setText(const QString &text) update(); updateGeometry(); #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::NameChanged, this); + QAccessibleEvent event(this, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); #endif } @@ -770,7 +770,7 @@ void QAbstractButton::setChecked(bool checked) #ifndef QT_NO_ACCESSIBILITY QAccessible::State s; s.checked = true; - QAccessibleStateChangeEvent event(s, this); + QAccessibleStateChangeEvent event(this, s); QAccessible::updateAccessibility(&event); #endif } diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp index 083b9303f4..c73da4e8c4 100644 --- a/src/widgets/widgets/qabstractslider.cpp +++ b/src/widgets/widgets/qabstractslider.cpp @@ -538,7 +538,7 @@ void QAbstractSlider::setValue(int value) emit sliderMoved((d->position = value)); } #ifndef QT_NO_ACCESSIBILITY - QAccessibleValueChangeEvent event(d->value, this); + QAccessibleValueChangeEvent event(this, d->value); QAccessible::updateAccessibility(&event); #endif sliderChange(SliderValueChange); diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp index 384fff7f7b..8bab6a9a1d 100644 --- a/src/widgets/widgets/qabstractspinbox.cpp +++ b/src/widgets/widgets/qabstractspinbox.cpp @@ -976,7 +976,7 @@ void QAbstractSpinBox::keyPressEvent(QKeyEvent *event) } } #ifndef QT_NO_ACCESSIBILITY - QAccessibleValueChangeEvent event(d->value, this); + QAccessibleValueChangeEvent event(this, d->value); QAccessible::updateAccessibility(&event); #endif return; @@ -1596,7 +1596,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 - QAccessibleValueChangeEvent event(value, q); + QAccessibleValueChangeEvent event(q, value); QAccessible::updateAccessibility(&event); #endif } diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 88c17ca704..dc1e0dbfab 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -983,7 +983,7 @@ void QComboBoxPrivate::_q_dataChanged(const QModelIndex &topLeft, const QModelIn q->update(); } #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::NameChanged, q, 0); + QAccessibleEvent event(q, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); #endif } @@ -1240,7 +1240,7 @@ void QComboBoxPrivate::_q_emitCurrentIndexChanged(const QModelIndex &index) emit q->currentIndexChanged(index.row()); emit q->currentIndexChanged(itemText(index)); #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::NameChanged, q, 0); + QAccessibleEvent event(q, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); #endif } @@ -2589,7 +2589,7 @@ void QComboBox::clear() Q_D(QComboBox); d->model->removeRows(0, d->model->rowCount(d->root), d->root); #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::NameChanged, this, 0); + QAccessibleEvent event(this, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); #endif } @@ -2609,7 +2609,7 @@ void QComboBox::clearEditText() if (d->lineEdit) d->lineEdit->clear(); #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::NameChanged, this, 0); + QAccessibleEvent event(this, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); #endif } @@ -2623,7 +2623,7 @@ void QComboBox::setEditText(const QString &text) if (d->lineEdit) d->lineEdit->setText(text); #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::NameChanged, this, 0); + QAccessibleEvent event(this, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); #endif } diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index 7186ddfccc..e9edea286f 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -249,7 +249,7 @@ void QGroupBox::setTitle(const QString &title) update(); updateGeometry(); #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::NameChanged, this, 0); + QAccessibleEvent event(this, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); #endif } diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index f36dea52dd..4450066df4 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -316,7 +316,7 @@ void QLabel::setText(const QString &text) #ifndef QT_NO_ACCESSIBILITY if (accessibleName().isEmpty()) { - QAccessibleEvent event(QAccessible::NameChanged, this, 0); + QAccessibleEvent event(this, QAccessible::NameChanged); QAccessible::updateAccessibility(&event); } #endif diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 36e394450b..6cee96e717 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -144,7 +144,7 @@ void QLineEditPrivate::_q_selectionChanged() emit q->selectionChanged(); #ifndef QT_NO_ACCESSIBILITY - QAccessibleTextSelectionEvent ev(control->selectionStart(), control->selectionEnd(), q); + QAccessibleTextSelectionEvent ev(q, control->selectionStart(), control->selectionEnd()); ev.setCursorPosition(control->cursorPosition()); QAccessible::updateAccessibility(&ev); #endif diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 7d4f7151a4..2abd4ceef7 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1076,9 +1076,11 @@ void QMenuPrivate::activateAction(QAction *action, QAction::ActionEvent action_e #ifndef QT_NO_ACCESSIBILITY if (QAccessible::isActive()) { int actionIndex = indexOf(action); - QAccessibleEvent focusEvent(QAccessible::Focus, q, actionIndex); + QAccessibleEvent focusEvent(q, QAccessible::Focus); + focusEvent.setChild(actionIndex); QAccessible::updateAccessibility(&focusEvent); - QAccessibleEvent selectionEvent(QAccessible::Selection, q, actionIndex); + QAccessibleEvent selectionEvent(q, QAccessible::Selection); + focusEvent.setChild(actionIndex); QAccessible::updateAccessibility(&selectionEvent); } #endif @@ -1972,7 +1974,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction) } #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::PopupMenuStart, this ,0); + QAccessibleEvent event(this, QAccessible::PopupMenuStart); QAccessible::updateAccessibility(&event); #endif } @@ -2094,7 +2096,7 @@ void QMenu::hideEvent(QHideEvent *) d->eventLoop->exit(); d->setCurrentAction(0); #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::PopupMenuEnd, this); + QAccessibleEvent event(this, QAccessible::PopupMenuEnd); QAccessible::updateAccessibility(&event); #endif #ifndef QT_NO_MENUBAR diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index 2712839103..5ec41b8ba6 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -531,9 +531,11 @@ void QMenuBarPrivate::_q_actionHovered() #ifndef QT_NO_ACCESSIBILITY if (QAccessible::isActive()) { int actionIndex = actions.indexOf(action); - QAccessibleEvent focusEvent(QAccessible::Focus, q, actionIndex); + QAccessibleEvent focusEvent(q, QAccessible::Focus); + focusEvent.setChild(actionIndex); QAccessible::updateAccessibility(&focusEvent); - QAccessibleEvent selectionEvent(QAccessible::Selection, q, actionIndex); + QAccessibleEvent selectionEvent(q, QAccessible::Selection); + selectionEvent.setChild(actionIndex); QAccessible::updateAccessibility(&selectionEvent); } #endif //QT_NO_ACCESSIBILITY diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp index 22b35d05a5..3e5b78fe2b 100644 --- a/src/widgets/widgets/qprogressbar.cpp +++ b/src/widgets/widgets/qprogressbar.cpp @@ -314,7 +314,7 @@ void QProgressBar::setValue(int value) d->value = value; emit valueChanged(value); #ifndef QT_NO_ACCESSIBILITY - QAccessibleValueChangeEvent event(value, this); + QAccessibleValueChangeEvent event(this, value); QAccessible::updateAccessibility(&event); #endif if (d->repaintRequired()) diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp index 5dae4e0b34..291e3548a2 100644 --- a/src/widgets/widgets/qpushbutton.cpp +++ b/src/widgets/widgets/qpushbutton.cpp @@ -378,7 +378,7 @@ void QPushButton::setDefault(bool enable) #ifndef QT_NO_ACCESSIBILITY QAccessible::State s; s.defaultButton = true; - QAccessibleStateChangeEvent event(s, this); + QAccessibleStateChangeEvent event(this, s); QAccessible::updateAccessibility(&event); #endif } diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index 84c32e519b..8263bf8546 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -1185,9 +1185,11 @@ void QTabBar::setCurrentIndex(int index) d->layoutTab(index); #ifndef QT_NO_ACCESSIBILITY if (QAccessible::isActive()) { - QAccessibleEvent focusEvent(QAccessible::Focus, this, index); + QAccessibleEvent focusEvent(this, QAccessible::Focus); + focusEvent.setChild(index); QAccessible::updateAccessibility(&focusEvent); - QAccessibleEvent selectionEvent(QAccessible::Selection, this, index); + QAccessibleEvent selectionEvent(this, QAccessible::Selection); + selectionEvent.setChild(index); QAccessible::updateAccessibility(&selectionEvent); } #endif diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index 8806999355..7d97f6d295 100644 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -769,15 +769,15 @@ void QWidgetLineControl::internalSetText(const QString &txt, int pos, bool edite #ifndef QT_NO_ACCESSIBILITY if (changed) { if (oldText.isEmpty()) { - QAccessibleTextInsertEvent event(0, txt, parent()); + QAccessibleTextInsertEvent event(parent(), 0, txt); event.setCursorPosition(m_cursor); QAccessible::updateAccessibility(&event); } else if (txt.isEmpty()) { - QAccessibleTextRemoveEvent event(0, oldText, parent()); + QAccessibleTextRemoveEvent event(parent(), 0, oldText); event.setCursorPosition(m_cursor); QAccessible::updateAccessibility(&event); } else { - QAccessibleTextUpdateEvent event(0, oldText, txt, parent()); + QAccessibleTextUpdateEvent event(parent(), 0, oldText, txt); event.setCursorPosition(m_cursor); QAccessible::updateAccessibility(&event); } @@ -828,7 +828,7 @@ void QWidgetLineControl::internalInsert(const QString &s) if (m_maskData) { QString ms = maskString(m_cursor, s); #ifndef QT_NO_ACCESSIBILITY - QAccessibleTextInsertEvent insertEvent(m_cursor, ms, parent()); + QAccessibleTextInsertEvent insertEvent(parent(), m_cursor, ms); QAccessible::updateAccessibility(&insertEvent); #endif for (int i = 0; i < (int) ms.length(); ++i) { @@ -840,14 +840,14 @@ void QWidgetLineControl::internalInsert(const QString &s) m_cursor = nextMaskBlank(m_cursor); m_textDirty = true; #ifndef QT_NO_ACCESSIBILITY - QAccessibleTextCursorEvent event(m_cursor, parent()); + QAccessibleTextCursorEvent event(parent(), m_cursor); QAccessible::updateAccessibility(&event); #endif } else { int remaining = m_maxLength - m_text.length(); if (remaining != 0) { #ifndef QT_NO_ACCESSIBILITY - QAccessibleTextInsertEvent insertEvent(m_cursor, s, parent()); + QAccessibleTextInsertEvent insertEvent(parent(), m_cursor, s); QAccessible::updateAccessibility(&insertEvent); #endif m_text.insert(m_cursor, s.left(remaining)); @@ -878,7 +878,7 @@ void QWidgetLineControl::internalDelete(bool wasBackspace) addCommand(Command((CommandType)((m_maskData ? 2 : 0) + (wasBackspace ? Remove : Delete)), m_cursor, m_text.at(m_cursor), -1, -1)); #ifndef QT_NO_ACCESSIBILITY - QAccessibleTextRemoveEvent event(m_cursor, m_text.at(m_cursor), parent()); + QAccessibleTextRemoveEvent event(parent(), m_cursor, m_text.at(m_cursor)); QAccessible::updateAccessibility(&event); #endif if (m_maskData) { @@ -919,7 +919,7 @@ void QWidgetLineControl::removeSelectedText() addCommand (Command(RemoveSelection, i, m_text.at(i), -1, -1)); } #ifndef QT_NO_ACCESSIBILITY - QAccessibleTextRemoveEvent event(m_selstart, m_text.mid(m_selstart, m_selend - m_selstart), parent()); + QAccessibleTextRemoveEvent event(parent(), m_selstart, m_text.mid(m_selstart, m_selend - m_selstart)); QAccessible::updateAccessibility(&event); #endif if (m_maskData) { @@ -1402,7 +1402,7 @@ void QWidgetLineControl::emitCursorPositionChanged() #ifndef QT_NO_ACCESSIBILITY // otherwise we send a selection update which includes the cursor if (!hasSelectedText()) { - QAccessibleTextCursorEvent event(m_cursor, parent()); + QAccessibleTextCursorEvent event(parent(), m_cursor); QAccessible::updateAccessibility(&event); } #endif |