QtWidgets tests: Replace qFindChild{ren} with QObject::findChild{ren}

Change-Id: I79a26387bcce0d7f79f4f9f70293e97dae52f949
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

5 files changed, 20 insertions, 20 deletions

diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index 5afc33f884..0c6d369254 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
@@ -742,7 +742,7 @@ void tst_QAbstractItemView::persistentEditorFocus()
     view.openPersistentEditor(model.index(0, 2));
 
     //these are spinboxes because we put numbers inside
-    QList<QSpinBox*> list = qFindChildren<QSpinBox*>(view.viewport());
+    QList<QSpinBox*> list = view.viewport()->findChildren<QSpinBox*>();
     QCOMPARE(list.count(), 2); //these should be the 2 editors
 
     view.setCurrentIndex(model.index(0, 0));
@@ -1270,21 +1270,21 @@ void tst_QAbstractItemView::task257481_emptyEditor()
     treeView.show();
 
     treeView.edit(model.index(0,0));
-    QList<QLineEdit *> lineEditors = qFindChildren<QLineEdit *>(treeView.viewport());
+    QList<QLineEdit *> lineEditors = treeView.viewport()->findChildren<QLineEdit *>();
     QCOMPARE(lineEditors.count(), 1);
     QVERIFY(!lineEditors.first()->size().isEmpty());
 
     QTest::qWait(30);
 
     treeView.edit(model.index(1,0));
-    lineEditors = qFindChildren<QLineEdit *>(treeView.viewport());
+    lineEditors = treeView.viewport()->findChildren<QLineEdit *>();
     QCOMPARE(lineEditors.count(), 1);
     QVERIFY(!lineEditors.first()->size().isEmpty());
 
     QTest::qWait(30);
 
     treeView.edit(model.index(2,0));
-    lineEditors = qFindChildren<QLineEdit *>(treeView.viewport());
+    lineEditors = treeView.viewport()->findChildren<QLineEdit *>();
     QCOMPARE(lineEditors.count(), 1);
     QVERIFY(!lineEditors.first()->size().isEmpty());
 }
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index 22a1743ff1..d47eebe03a 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
@@ -365,7 +365,7 @@ void tst_QItemDelegate::editorKeyPress()
     view.setCurrentIndex(index); // the editor will only selectAll on the current index
     view.edit(index);
 
-    QList<QLineEdit*> lineEditors = qFindChildren<QLineEdit *>(view.viewport());
+    QList<QLineEdit*> lineEditors = view.viewport()->findChildren<QLineEdit *>();
     QCOMPARE(lineEditors.count(), 1);
 
     QLineEdit *editor = lineEditors.at(0);
@@ -394,7 +394,7 @@ void tst_QItemDelegate::doubleEditorNegativeInput()
     view.setCurrentIndex(index); // the editor will only selectAll on the current index
     view.edit(index);
 
-    QList<QDoubleSpinBox*> editors = qFindChildren<QDoubleSpinBox *>(view.viewport());
+    QList<QDoubleSpinBox*> editors = view.viewport()->findChildren<QDoubleSpinBox *>();
     QCOMPARE(editors.count(), 1);
 
     QDoubleSpinBox *editor = editors.at(0);
@@ -776,7 +776,7 @@ void tst_QItemDelegate::dateTimeEditor()
 
     QTestEventLoop::instance().enterLoop(1);
 
-    QTimeEdit *timeEditor = qFindChild<QTimeEdit *>(widget.viewport());
+    QTimeEdit *timeEditor = widget.viewport()->findChild<QTimeEdit *>();
     QVERIFY(timeEditor);
     QCOMPARE(timeEditor->time(), time);
     // The data must actually be different in order for the model
@@ -790,7 +790,7 @@ void tst_QItemDelegate::dateTimeEditor()
 
     QTestEventLoop::instance().enterLoop(1);
 
-    QDateEdit *dateEditor = qFindChild<QDateEdit *>(widget.viewport());
+    QDateEdit *dateEditor = widget.viewport()->findChild<QDateEdit *>();
     QVERIFY(dateEditor);
     QCOMPARE(dateEditor->date(), date);
     dateEditor->setDate(date.addDays(60));
@@ -1312,7 +1312,7 @@ void tst_QItemDelegate::enterKey()
     view.edit(index);
     QTest::qWait(30);
 
-    QList<QWidget*> lineEditors = qFindChildren<QWidget *>(view.viewport(), QString::fromLatin1("TheEditor"));
+    QList<QWidget*> lineEditors = view.viewport()->findChildren<QWidget *>(QString::fromLatin1("TheEditor"));
     QCOMPARE(lineEditors.count(), 1);
 
     QPointer<QWidget> editor = lineEditors.at(0);
@@ -1344,7 +1344,7 @@ void tst_QItemDelegate::task257859_finalizeEdit()
     view.edit(index);
     QTest::qWait(30);
 
-    QList<QLineEdit *> lineEditors = qFindChildren<QLineEdit *>(view.viewport());
+    QList<QLineEdit *> lineEditors = view.viewport()->findChildren<QLineEdit *>();
     QCOMPARE(lineEditors.count(), 1);
 
     QPointer<QWidget> editor = lineEditors.at(0);
@@ -1397,7 +1397,7 @@ void tst_QItemDelegate::comboBox()
 
     QTestEventLoop::instance().enterLoop(1);
 
-    QComboBox *boolEditor = qFindChild<QComboBox*>(widget.viewport());
+    QComboBox *boolEditor = widget.viewport()->findChild<QComboBox*>();
     QVERIFY(boolEditor);
     QCOMPARE(boolEditor->currentIndex(), 1); // True is selected initially.
     // The data must actually be different in order for the model
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index d1107a687c..13476a7ffa 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -3727,7 +3727,7 @@ void tst_QTableView::addColumnWhileEditing()
     //let's see if the editor is moved to the right location
     //after adding a column
     model.setColumnCount(model.columnCount() + 1);
-    QPointer<QLineEdit> editor = qFindChild<QLineEdit*>(&view);
+    QPointer<QLineEdit> editor = view.findChild<QLineEdit*>();
     QVERIFY(editor);
     QCOMPARE(editor->geometry(), view.visualRect(last));
 
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index e142e0ce6e..9a7b7956d8 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -819,7 +819,7 @@ void tst_QTreeView::editTriggers()
     view.setCurrentIndex(view.model()->index(0, 0));
 
     // Verify that we don't have any editor initially
-    QVERIFY(!qFindChild<QLineEdit *>(&view, QString()));
+    QVERIFY(!view.findChild<QLineEdit *>(QString()));
 
     // Set the triggers
     view.setEditTriggers(editTriggers);
@@ -865,7 +865,7 @@ void tst_QTreeView::editTriggers()
 #ifdef Q_OS_MAC
     QEXPECT_FAIL("EditKeyPressed 4", "QTBUG-23696", Continue);
 #endif
-    QTRY_COMPARE(qFindChild<QLineEdit *>(&view, QString()) != 0, editorOpened);
+    QTRY_COMPARE(view.findChild<QLineEdit *>(QString()) != 0, editorOpened);
 }
 
 void tst_QTreeView::hasAutoScroll()
@@ -1228,15 +1228,15 @@ void tst_QTreeView::openPersistentEditor()
     view.setModel(&treeModel);
     view.show();
 
-    QVERIFY(!qFindChild<QLineEdit *>(view.viewport()));
+    QVERIFY(!view.viewport()->findChild<QLineEdit *>());
     view.openPersistentEditor(view.model()->index(0, 0));
-    QVERIFY(qFindChild<QLineEdit *>(view.viewport()));
+    QVERIFY(view.viewport()->findChild<QLineEdit *>());
 
     view.closePersistentEditor(view.model()->index(0, 0));
-    QVERIFY(!qFindChild<QLineEdit *>(view.viewport())->isVisible());
+    QVERIFY(!view.viewport()->findChild<QLineEdit *>()->isVisible());
 
     qApp->sendPostedEvents(0, QEvent::DeferredDelete);
-    QVERIFY(!qFindChild<QLineEdit *>(view.viewport()));
+    QVERIFY(!view.viewport()->findChild<QLineEdit *>());
 }
 
 void tst_QTreeView::rootIndex()
diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index f119c3fbec..83ba1ddcda 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -467,7 +467,7 @@ void tst_QTreeWidget::editItem()
             tree.editItem(item, col);
             QApplication::instance()->processEvents();
             QApplication::instance()->processEvents();
-            QLineEdit *editor = qFindChild<QLineEdit*>(&tree);
+            QLineEdit *editor = tree.findChild<QLineEdit*>();
             if (editor) {
                 QVERIFY(item->flags() & Qt::ItemIsEditable);
                 QCOMPARE(editor->selectedText(), editor->text());
@@ -2079,7 +2079,7 @@ void tst_QTreeWidget::itemWidget()
                     // ### should you really be able to open a persistent
                     //     editor for an item that isn't editable??
                     tree.openPersistentEditor(item, col);
-                    QWidget *editor = qFindChild<QLineEdit*>(&tree);
+                    QWidget *editor = tree.findChild<QLineEdit*>();
                     QVERIFY(editor != 0);
                     tree.closePersistentEditor(item, col);
                 }