From c2e8db58413207315474232697f12ddceb8310e7 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 12 Mar 2012 19:43:03 +0100 Subject: Remove QAccessibleEvent child parameter. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the api cleaner and generally the child should not be there. It is only sometimes more convenient not to create a QAccessibleInterface instance, so the functionallity is kept. Change-Id: I26018a6d3e0549f4d79856775b4167c5660e229d Reviewed-by: Jan-Arve Sæther --- .../other/qaccessibility/tst_qaccessibility.cpp | 72 ++++++++++++---------- 1 file changed, 39 insertions(+), 33 deletions(-) (limited to 'tests/auto/other/qaccessibility/tst_qaccessibility.cpp') diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index fbbf45ad58..b71594edae 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -369,21 +369,21 @@ void tst_QAccessibility::eventTest() button->setObjectName(QString("Olaf")); button->show(); - QAccessibleEvent showEvent(QAccessible::ObjectShow, button, -1); + QAccessibleEvent showEvent(button, QAccessible::ObjectShow); QVERIFY_EVENT(&showEvent); button->setFocus(Qt::MouseFocusReason); QTestAccessibility::clearEvents(); QTest::mouseClick(button, Qt::LeftButton, 0); button->setAccessibleName("Olaf the second"); - QAccessibleEvent nameEvent(QAccessible::NameChanged, button); + QAccessibleEvent nameEvent(button, QAccessible::NameChanged); QVERIFY_EVENT(&nameEvent); button->setAccessibleDescription("This is a button labeled Olaf"); - QAccessibleEvent descEvent(QAccessible::DescriptionChanged, button); + QAccessibleEvent descEvent(button, QAccessible::DescriptionChanged); QVERIFY_EVENT(&descEvent); button->hide(); - QAccessibleEvent hideEvent(QAccessible::ObjectHide, button); + QAccessibleEvent hideEvent(button, QAccessible::ObjectHide); QVERIFY_EVENT(&hideEvent); delete button; @@ -688,9 +688,10 @@ void tst_QAccessibility::hideShowTest() window->show(); QVERIFY(!state(window).invisible); QVERIFY(!state(child).invisible); - QAccessibleEvent show(QAccessible::ObjectShow, window); + + QAccessibleEvent show(window, QAccessible::ObjectShow); QVERIFY(QTestAccessibility::containsEvent(&show)); - QAccessibleEvent showChild(QAccessible::ObjectShow, child); + QAccessibleEvent showChild(child, QAccessible::ObjectShow); QVERIFY(QTestAccessibility::containsEvent(&showChild)); QTestAccessibility::clearEvents(); @@ -698,9 +699,9 @@ void tst_QAccessibility::hideShowTest() window->hide(); QVERIFY(state(window).invisible); QVERIFY(state(child).invisible); - QAccessibleEvent hide(QAccessible::ObjectHide, window); + QAccessibleEvent hide(window, QAccessible::ObjectHide); QVERIFY(QTestAccessibility::containsEvent(&hide)); - QAccessibleEvent hideChild(QAccessible::ObjectHide, child); + QAccessibleEvent hideChild(child, QAccessible::ObjectHide); QVERIFY(QTestAccessibility::containsEvent(&hideChild)); QTestAccessibility::clearEvents(); @@ -782,7 +783,7 @@ void tst_QAccessibility::mainWindowTest() QLatin1String name = QLatin1String("I am the main window"); mw->setWindowTitle(name); QTest::qWaitForWindowShown(mw); - QAccessibleEvent show(QAccessible::ObjectShow, mw); + QAccessibleEvent show(mw, QAccessible::ObjectShow); QVERIFY_EVENT(&show); QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(mw); @@ -943,7 +944,7 @@ void tst_QAccessibility::buttonTest() QVERIFY(checkBox.isChecked()); QAccessible::State st; st.checked = true; - QAccessibleStateChangeEvent ev(st, &checkBox); + QAccessibleStateChangeEvent ev(&checkBox, st); QVERIFY_EVENT(&ev); checkBox.setChecked(false); QVERIFY_EVENT(&ev); @@ -964,7 +965,7 @@ void tst_QAccessibility::buttonTest() QVERIFY(radio.isChecked()); QAccessible::State st; st.checked = true; - QAccessibleStateChangeEvent ev(st, &radio); + QAccessibleStateChangeEvent ev(&radio, st); QVERIFY_EVENT(&ev); delete interface; } @@ -1028,13 +1029,13 @@ void tst_QAccessibility::scrollBarTest() scrollBar->resize(200, 50); scrollBar->show(); QVERIFY(!scrollBarInterface->state().invisible); - QAccessibleEvent show(QAccessible::ObjectShow, scrollBar); + QAccessibleEvent show(scrollBar, QAccessible::ObjectShow); QVERIFY(QTestAccessibility::containsEvent(&show)); QTestAccessibility::clearEvents(); scrollBar->hide(); QVERIFY(scrollBarInterface->state().invisible); - QAccessibleEvent hide(QAccessible::ObjectHide, scrollBar); + QAccessibleEvent hide(scrollBar, QAccessible::ObjectHide); QVERIFY(QTestAccessibility::containsEvent(&hide)); QTestAccessibility::clearEvents(); @@ -1475,7 +1476,7 @@ void tst_QAccessibility::spinBoxTest() QTestAccessibility::clearEvents(); QTest::keyPress(spinBox, Qt::Key_Up); QTest::qWait(200); - QAccessibleValueChangeEvent expectedEvent(spinBox->value(), spinBox); + QAccessibleValueChangeEvent expectedEvent(spinBox, spinBox->value()); QVERIFY(QTestAccessibility::containsEvent(&expectedEvent)); delete spinBox; QTestAccessibility::clearEvents(); @@ -1747,7 +1748,7 @@ void tst_QAccessibility::lineEditTest() le->setFocus(Qt::TabFocusReason); QTestAccessibility::clearEvents(); le2->setFocus(Qt::TabFocusReason); - QAccessibleEvent ev(QAccessible::Focus, le2); + QAccessibleEvent ev(le2, QAccessible::Focus); QTRY_VERIFY(QTestAccessibility::containsEvent(&ev)); le->setText(QLatin1String("500")); @@ -1771,7 +1772,7 @@ void tst_QAccessibility::lineEditTest() le3->setCursorPosition(3); QCOMPARE(textIface->cursorPosition(), 3); - QAccessibleTextCursorEvent caretEvent(3, le3); + QAccessibleTextCursorEvent caretEvent(le3, 3); QTRY_VERIFY(QTestAccessibility::containsEvent(&caretEvent)); QCOMPARE(textIface->selectionCount(), 0); QTestAccessibility::clearEvents(); @@ -1828,7 +1829,7 @@ void tst_QAccessibility::lineEditTest() QTestAccessibility::clearEvents(); // cursor lineEdit->setCursorPosition(5); - QAccessibleTextCursorEvent cursorEvent(5, lineEdit); + QAccessibleTextCursorEvent cursorEvent(lineEdit, 5); QVERIFY_EVENT(&cursorEvent); lineEdit->setCursorPosition(0); cursorEvent.setCursorPosition(0); @@ -1837,7 +1838,7 @@ void tst_QAccessibility::lineEditTest() // selection lineEdit->setSelection(2, 4); - QAccessibleTextSelectionEvent sel(2, 2+4, lineEdit); + QAccessibleTextSelectionEvent sel(lineEdit, 2, 2+4); QVERIFY_EVENT(&sel); lineEdit->selectAll(); @@ -1847,24 +1848,24 @@ void tst_QAccessibility::lineEditTest() lineEdit->setSelection(10, -4); QCOMPARE(lineEdit->cursorPosition(), 6); - QAccessibleTextSelectionEvent sel2(6, 10, lineEdit); + QAccessibleTextSelectionEvent sel2(lineEdit, 6, 10); sel2.setCursorPosition(6); QVERIFY_EVENT(&sel2); lineEdit->deselect(); - QAccessibleTextSelectionEvent sel3(-1, -1, lineEdit); + QAccessibleTextSelectionEvent sel3(lineEdit, -1, -1); sel3.setCursorPosition(6); QVERIFY_EVENT(&sel3); // editing lineEdit->clear(); // FIXME: improve redundant updates - QAccessibleTextRemoveEvent remove(0, text, lineEdit); + QAccessibleTextRemoveEvent remove(lineEdit, 0, text); QVERIFY_EVENT(&remove); - QAccessibleTextSelectionEvent noSel(-1, -1, lineEdit); + QAccessibleTextSelectionEvent noSel(lineEdit, -1, -1); QVERIFY_EVENT(&noSel); - QAccessibleTextCursorEvent cursor(0, lineEdit); + QAccessibleTextCursorEvent cursor(lineEdit, 0); QVERIFY_EVENT(&cursor); lineEdit->setText("foo"); @@ -1872,11 +1873,11 @@ void tst_QAccessibility::lineEditTest() cursorEvent.setCursorPosition(3); QVERIFY_EVENT(&cursorEvent); - QAccessibleTextInsertEvent e(0, "foo", lineEdit); + QAccessibleTextInsertEvent e(lineEdit, 0, "foo"); QVERIFY(QTestAccessibility::containsEvent(&e)); lineEdit->setText("bar"); - QAccessibleTextUpdateEvent update(0, "foo", "bar", lineEdit); + QAccessibleTextUpdateEvent update(lineEdit, 0, "foo", "bar"); QVERIFY(QTestAccessibility::containsEvent(&update)); // QTestEventList keys; @@ -2214,15 +2215,20 @@ void tst_QAccessibility::listTest() // Check for events QTest::mouseClick(listView->viewport(), Qt::LeftButton, 0, listView->visualItemRect(listView->item(1)).center()); - QAccessibleEvent selectList2(QAccessible::Selection, listView, 2); - QVERIFY(QTestAccessibility::containsEvent(&selectList2)); - QAccessibleEvent focusList2(QAccessible::Focus, listView, 2); - QVERIFY(QTestAccessibility::containsEvent(&focusList2)); + QAccessibleEvent selectionEvent(listView, QAccessible::Selection); + selectionEvent.setChild(2); + QAccessibleEvent focusEvent(listView, QAccessible::Focus); + focusEvent.setChild(2); + QVERIFY(QTestAccessibility::containsEvent(&selectionEvent)); + QVERIFY(QTestAccessibility::containsEvent(&focusEvent)); QTest::mouseClick(listView->viewport(), Qt::LeftButton, 0, listView->visualItemRect(listView->item(2)).center()); - QAccessibleEvent selectList3(QAccessible::Selection, listView, 3); - QVERIFY(QTestAccessibility::containsEvent(&selectList3)); - QAccessibleEvent focusList3(QAccessible::Focus, listView, 3); - QVERIFY(QTestAccessibility::containsEvent(&focusList3)); + + QAccessibleEvent selectionEvent2(listView, QAccessible::Selection); + selectionEvent2.setChild(3); + QAccessibleEvent focusEvent2(listView, QAccessible::Focus); + focusEvent2.setChild(3); + QVERIFY(QTestAccessibility::containsEvent(&selectionEvent2)); + QVERIFY(QTestAccessibility::containsEvent(&focusEvent2)); listView->addItem("Munich"); QCOMPARE(iface->childCount(), 4); -- cgit v1.2.3