QML focus API updates.

The wantsFocus property has been renamed to activeFocus, to better
reflect its value. Reading and writing the focus property is also now
consistent -- this property represents focus within a scope. Other small
changes were made to keep things consistent with the new naming.

Reviewed-by: Aaron Kennedy

1 files changed, 63 insertions, 68 deletions

diff --git a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp
index 2559087..b0c9c03 100644
--- a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp
+++ b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp
@@ -118,22 +118,22 @@ void tst_qdeclarativefocusscope::basic()
 
     QVERIFY(view->hasFocus());
     QVERIFY(view->scene()->hasFocus());
-    QVERIFY(item0->wantsFocus() == true);
-    QVERIFY(item1->hasFocus() == true);
-    QVERIFY(item2->hasFocus() == false);
-    QVERIFY(item3->hasFocus() == false);
+    QVERIFY(item0->hasActiveFocus() == true);
+    QVERIFY(item1->hasActiveFocus() == true);
+    QVERIFY(item2->hasActiveFocus() == false);
+    QVERIFY(item3->hasActiveFocus() == false);
 
     QTest::keyClick(view, Qt::Key_Right);
-    QVERIFY(item0->wantsFocus() == true);
-    QVERIFY(item1->hasFocus() == false);
-    QVERIFY(item2->hasFocus() == true);
-    QVERIFY(item3->hasFocus() == false);
+    QVERIFY(item0->hasActiveFocus() == true);
+    QVERIFY(item1->hasActiveFocus() == false);
+    QVERIFY(item2->hasActiveFocus() == true);
+    QVERIFY(item3->hasActiveFocus() == false);
 
     QTest::keyClick(view, Qt::Key_Down);
-    QVERIFY(item0->wantsFocus() == false);
-    QVERIFY(item1->hasFocus() == false);
-    QVERIFY(item2->hasFocus() == false);
-    QVERIFY(item3->hasFocus() == true);
+    QVERIFY(item0->hasActiveFocus() == false);
+    QVERIFY(item1->hasActiveFocus() == false);
+    QVERIFY(item2->hasActiveFocus() == false);
+    QVERIFY(item3->hasActiveFocus() == true);
 
     delete view;
 }
@@ -166,16 +166,11 @@ void tst_qdeclarativefocusscope::nested()
     QVERIFY(view->hasFocus());
     QVERIFY(view->scene()->hasFocus());
 
-    QVERIFY(item1->wantsFocus() == true);
-    QVERIFY(item1->hasFocus() == false);
-    QVERIFY(item2->wantsFocus() == true);
-    QVERIFY(item2->hasFocus() == false);
-    QVERIFY(item3->wantsFocus() == true);
-    QVERIFY(item3->hasFocus() == false);
-    QVERIFY(item4->wantsFocus() == true);
-    QVERIFY(item4->hasFocus() == false);
-    QVERIFY(item5->wantsFocus() == true);
-    QVERIFY(item5->hasFocus() == true);
+    QVERIFY(item1->hasActiveFocus() == true);
+    QVERIFY(item2->hasActiveFocus() == true);
+    QVERIFY(item3->hasActiveFocus() == true);
+    QVERIFY(item4->hasActiveFocus() == true);
+    QVERIFY(item5->hasActiveFocus() == true);
     delete view;
 }
 
@@ -204,22 +199,22 @@ void tst_qdeclarativefocusscope::noFocus()
 
     QVERIFY(view->hasFocus());
     QVERIFY(view->scene()->hasFocus());
-    QVERIFY(item0->wantsFocus() == false);
-    QVERIFY(item1->hasFocus() == false);
-    QVERIFY(item2->hasFocus() == false);
-    QVERIFY(item3->hasFocus() == false);
+    QVERIFY(item0->hasActiveFocus() == false);
+    QVERIFY(item1->hasActiveFocus() == false);
+    QVERIFY(item2->hasActiveFocus() == false);
+    QVERIFY(item3->hasActiveFocus() == false);
 
     QTest::keyClick(view, Qt::Key_Right);
-    QVERIFY(item0->wantsFocus() == false);
-    QVERIFY(item1->hasFocus() == false);
-    QVERIFY(item2->hasFocus() == false);
-    QVERIFY(item3->hasFocus() == false);
+    QVERIFY(item0->hasActiveFocus() == false);
+    QVERIFY(item1->hasActiveFocus() == false);
+    QVERIFY(item2->hasActiveFocus() == false);
+    QVERIFY(item3->hasActiveFocus() == false);
 
     QTest::keyClick(view, Qt::Key_Down);
-    QVERIFY(item0->wantsFocus() == false);
-    QVERIFY(item1->hasFocus() == false);
-    QVERIFY(item2->hasFocus() == false);
-    QVERIFY(item3->hasFocus() == false);
+    QVERIFY(item0->hasActiveFocus() == false);
+    QVERIFY(item1->hasActiveFocus() == false);
+    QVERIFY(item2->hasActiveFocus() == false);
+    QVERIFY(item3->hasActiveFocus() == false);
 
     delete view;
 }
@@ -249,32 +244,32 @@ void tst_qdeclarativefocusscope::textEdit()
 
     QVERIFY(view->hasFocus());
     QVERIFY(view->scene()->hasFocus());
-    QVERIFY(item0->wantsFocus() == true);
-    QVERIFY(item1->hasFocus() == true);
-    QVERIFY(item2->hasFocus() == false);
-    QVERIFY(item3->hasFocus() == false);
+    QVERIFY(item0->hasActiveFocus() == true);
+    QVERIFY(item1->hasActiveFocus() == true);
+    QVERIFY(item2->hasActiveFocus() == false);
+    QVERIFY(item3->hasActiveFocus() == false);
 
     QTest::keyClick(view, Qt::Key_Right);
-    QVERIFY(item0->wantsFocus() == true);
-    QVERIFY(item1->hasFocus() == true);
-    QVERIFY(item2->hasFocus() == false);
-    QVERIFY(item3->hasFocus() == false);
+    QVERIFY(item0->hasActiveFocus() == true);
+    QVERIFY(item1->hasActiveFocus() == true);
+    QVERIFY(item2->hasActiveFocus() == false);
+    QVERIFY(item3->hasActiveFocus() == false);
 
     QTest::keyClick(view, Qt::Key_Right);
     QTest::keyClick(view, Qt::Key_Right);
     QTest::keyClick(view, Qt::Key_Right);
     QTest::keyClick(view, Qt::Key_Right);
     QTest::keyClick(view, Qt::Key_Right);
-    QVERIFY(item0->wantsFocus() == true);
-    QVERIFY(item1->hasFocus() == false);
-    QVERIFY(item2->hasFocus() == true);
-    QVERIFY(item3->hasFocus() == false);
+    QVERIFY(item0->hasActiveFocus() == true);
+    QVERIFY(item1->hasActiveFocus() == false);
+    QVERIFY(item2->hasActiveFocus() == true);
+    QVERIFY(item3->hasActiveFocus() == false);
 
     QTest::keyClick(view, Qt::Key_Down);
-    QVERIFY(item0->wantsFocus() == false);
-    QVERIFY(item1->hasFocus() == false);
-    QVERIFY(item2->hasFocus() == false);
-    QVERIFY(item3->hasFocus() == true);
+    QVERIFY(item0->hasActiveFocus() == false);
+    QVERIFY(item1->hasActiveFocus() == false);
+    QVERIFY(item2->hasActiveFocus() == false);
+    QVERIFY(item3->hasActiveFocus() == true);
 
     delete view;
 }
@@ -308,28 +303,28 @@ void tst_qdeclarativefocusscope::forceFocus()
 
     QVERIFY(view->hasFocus());
     QVERIFY(view->scene()->hasFocus());
-    QVERIFY(item0->wantsFocus() == true);
-    QVERIFY(item1->hasFocus() == true);
-    QVERIFY(item2->hasFocus() == false);
-    QVERIFY(item3->wantsFocus() == false);
-    QVERIFY(item4->hasFocus() == false);
-    QVERIFY(item5->hasFocus() == false);
+    QVERIFY(item0->hasActiveFocus() == true);
+    QVERIFY(item1->hasActiveFocus() == true);
+    QVERIFY(item2->hasActiveFocus() == false);
+    QVERIFY(item3->hasActiveFocus() == false);
+    QVERIFY(item4->hasActiveFocus() == false);
+    QVERIFY(item5->hasActiveFocus() == false);
 
     QTest::keyClick(view, Qt::Key_4);
-    QVERIFY(item0->wantsFocus() == true);
-    QVERIFY(item1->hasFocus() == true);
-    QVERIFY(item2->hasFocus() == false);
-    QVERIFY(item3->wantsFocus() == false);
-    QVERIFY(item4->hasFocus() == false);
-    QVERIFY(item5->hasFocus() == false);
+    QVERIFY(item0->hasActiveFocus() == true);
+    QVERIFY(item1->hasActiveFocus() == true);
+    QVERIFY(item2->hasActiveFocus() == false);
+    QVERIFY(item3->hasActiveFocus() == false);
+    QVERIFY(item4->hasActiveFocus() == false);
+    QVERIFY(item5->hasActiveFocus() == false);
 
     QTest::keyClick(view, Qt::Key_5);
-    QVERIFY(item0->wantsFocus() == false);
-    QVERIFY(item1->hasFocus() == false);
-    QVERIFY(item2->hasFocus() == false);
-    QVERIFY(item3->wantsFocus() == true);
-    QVERIFY(item4->hasFocus() == false);
-    QVERIFY(item5->hasFocus() == true);
+    QVERIFY(item0->hasActiveFocus() == false);
+    QVERIFY(item1->hasActiveFocus() == false);
+    QVERIFY(item2->hasActiveFocus() == false);
+    QVERIFY(item3->hasActiveFocus() == true);
+    QVERIFY(item4->hasActiveFocus() == false);
+    QVERIFY(item5->hasActiveFocus() == true);
 
     delete view;
 }