From f6e739d9e3125d3866651b896bdb057f1bfb4da9 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Wed, 27 Mar 2013 22:16:32 +0800 Subject: QtWidgets tests: Replace qFindChild{ren} with QObject::findChild{ren} Change-Id: I79a26387bcce0d7f79f4f9f70293e97dae52f949 Reviewed-by: Friedemann Kleint --- tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp | 10 +-- .../dialogs/qerrormessage/tst_qerrormessage.cpp | 16 ++-- .../dialogs/qfiledialog/tst_qfiledialog.cpp | 76 +++++++++--------- .../dialogs/qfiledialog2/tst_qfiledialog2.cpp | 90 +++++++++++----------- .../dialogs/qinputdialog/tst_qinputdialog.cpp | 16 ++-- .../qprogressdialog/tst_qprogressdialog.cpp | 2 +- tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp | 2 +- .../tst_qgraphicsproxywidget.cpp | 2 +- .../qgraphicsview/tst_qgraphicsview.cpp | 2 +- .../qabstractitemview/tst_qabstractitemview.cpp | 8 +- .../itemviews/qitemdelegate/tst_qitemdelegate.cpp | 14 ++-- .../itemviews/qtableview/tst_qtableview.cpp | 2 +- .../widgets/itemviews/qtreeview/tst_qtreeview.cpp | 12 +-- .../itemviews/qtreewidget/tst_qtreewidget.cpp | 4 +- .../kernel/qapplication/tst_qapplication.cpp | 4 +- tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 6 +- tests/auto/widgets/styles/qstyle/tst_qstyle.cpp | 2 +- .../qstylesheetstyle/tst_qstylesheetstyle.cpp | 6 +- .../qcalendarwidget/tst_qcalendarwidget.cpp | 16 ++-- .../widgets/widgets/qcombobox/tst_qcombobox.cpp | 14 ++-- .../widgets/qdatetimeedit/tst_qdatetimeedit.cpp | 6 +- .../qdialogbuttonbox/tst_qdialogbuttonbox.cpp | 12 +-- .../widgets/qmainwindow/tst_qmainwindow.cpp | 10 +-- .../auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 20 ++--- .../widgets/qmdisubwindow/tst_qmdisubwindow.cpp | 8 +- .../widgets/qplaintextedit/tst_qplaintextedit.cpp | 2 +- .../widgets/widgets/qstatusbar/tst_qstatusbar.cpp | 4 +- .../widgets/widgets/qtextedit/tst_qtextedit.cpp | 4 +- 28 files changed, 185 insertions(+), 185 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index b4042a5857..6d847086d9 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -247,7 +247,7 @@ void tst_QDialog::showMaximized() QDialog dialog(0); dialog.setSizeGripEnabled(true); #ifndef QT_NO_SIZEGRIP - QSizeGrip *sizeGrip = qFindChild(&dialog); + QSizeGrip *sizeGrip = dialog.findChild(); QVERIFY(sizeGrip); #endif @@ -324,7 +324,7 @@ void tst_QDialog::showFullScreen() QDialog dialog(0, Qt::X11BypassWindowManagerHint); dialog.setSizeGripEnabled(true); #ifndef QT_NO_SIZEGRIP - QSizeGrip *sizeGrip = qFindChild(&dialog); + QSizeGrip *sizeGrip = dialog.findChild(); QVERIFY(sizeGrip); #endif @@ -438,7 +438,7 @@ void tst_QDialog::showSizeGrip() QVERIFY(!dialog.isSizeGripEnabled()); dialog.setSizeGripEnabled(true); - QPointer sizeGrip = qFindChild(&dialog); + QPointer sizeGrip = dialog.findChild(); QVERIFY(sizeGrip); QVERIFY(sizeGrip->isVisible()); QVERIFY(dialog.isSizeGripEnabled()); @@ -456,7 +456,7 @@ void tst_QDialog::showSizeGrip() dialog.showExtension(false); QVERIFY(dialog.extension() && !dialog.extension()->isVisible()); QVERIFY(dialog.isSizeGripEnabled()); - sizeGrip = qFindChild(&dialog); + sizeGrip = dialog.findChild(); QVERIFY(sizeGrip); QVERIFY(sizeGrip->isVisible()); @@ -474,7 +474,7 @@ void tst_QDialog::showSizeGrip() QVERIFY(!dialog.isSizeGripEnabled()); dialog.setSizeGripEnabled(true); - sizeGrip = qFindChild(&dialog); + sizeGrip = dialog.findChild(); QVERIFY(sizeGrip); QVERIFY(sizeGrip->isVisible()); sizeGrip->hide(); diff --git a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp index e091267889..cb2aaeea46 100644 --- a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp +++ b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp @@ -64,14 +64,14 @@ void tst_QErrorMessage::dontShowAgain() // show an error with plain string errorMessageDialog.showMessage(plainString); QVERIFY(errorMessageDialog.isVisible()); - checkBox = qFindChild(&errorMessageDialog); + checkBox = errorMessageDialog.findChild(); QVERIFY(checkBox); QVERIFY(checkBox->isChecked()); errorMessageDialog.close(); errorMessageDialog.showMessage(plainString); QVERIFY(errorMessageDialog.isVisible()); - checkBox = qFindChild(&errorMessageDialog); + checkBox = errorMessageDialog.findChild(); QVERIFY(checkBox); QVERIFY(checkBox->isChecked()); checkBox->setChecked(false); @@ -83,7 +83,7 @@ void tst_QErrorMessage::dontShowAgain() // show an error with an html string errorMessageDialog.showMessage(htmlString); QVERIFY(errorMessageDialog.isVisible()); - checkBox = qFindChild(&errorMessageDialog); + checkBox = errorMessageDialog.findChild(); QVERIFY(checkBox); QVERIFY(!checkBox->isChecked()); checkBox->setChecked(true); @@ -91,7 +91,7 @@ void tst_QErrorMessage::dontShowAgain() errorMessageDialog.showMessage(htmlString); QVERIFY(errorMessageDialog.isVisible()); - checkBox = qFindChild(&errorMessageDialog); + checkBox = errorMessageDialog.findChild(); QVERIFY(checkBox); QVERIFY(checkBox->isChecked()); checkBox->setChecked(false); @@ -111,7 +111,7 @@ void tst_QErrorMessage::dontShowCategoryAgain() errorMessageDialog.showMessage(htmlString,"Cat 1"); QVERIFY(errorMessageDialog.isVisible()); - checkBox = qFindChild(&errorMessageDialog); + checkBox = errorMessageDialog.findChild(); QVERIFY(checkBox); QVERIFY(checkBox->isChecked()); checkBox->setChecked(true); @@ -119,7 +119,7 @@ void tst_QErrorMessage::dontShowCategoryAgain() errorMessageDialog.showMessage(htmlString,"Cat 1"); QVERIFY(errorMessageDialog.isVisible()); - checkBox = qFindChild(&errorMessageDialog); + checkBox = errorMessageDialog.findChild(); QVERIFY(checkBox); QVERIFY(checkBox->isChecked()); checkBox->setChecked(true); @@ -127,7 +127,7 @@ void tst_QErrorMessage::dontShowCategoryAgain() errorMessageDialog.showMessage(htmlString2,"Cat 1"); QVERIFY(errorMessageDialog.isVisible()); - checkBox = qFindChild(&errorMessageDialog); + checkBox = errorMessageDialog.findChild(); QVERIFY(checkBox); QVERIFY(checkBox->isChecked()); checkBox->setChecked(true); @@ -135,7 +135,7 @@ void tst_QErrorMessage::dontShowCategoryAgain() errorMessageDialog.showMessage(htmlString,"Cat 1"); QVERIFY(errorMessageDialog.isVisible()); - checkBox = qFindChild(&errorMessageDialog); + checkBox = errorMessageDialog.findChild(); QVERIFY(checkBox); QVERIFY(checkBox->isChecked()); checkBox->setChecked(false); diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 5e37c12fbf..d797c553db 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -200,7 +200,7 @@ void tst_QFiledialog::currentChangedSignal() fd.setViewMode(QFileDialog::List); QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(QString))); - QListView* listView = qFindChild(&fd, "listView"); + QListView* listView = fd.findChild("listView"); QVERIFY(listView); fd.setDirectory(QDir::root()); QModelIndex root = listView->rootIndex(); @@ -229,14 +229,14 @@ void tst_QFiledialog::directoryEnteredSignal() QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(QString))); // sidebar - QSidebar *sidebar = qFindChild(&fd, "sidebar"); + QSidebar *sidebar = fd.findChild("sidebar"); sidebar->setCurrentIndex(sidebar->model()->index(1, 0)); QTest::keyPress(sidebar->viewport(), Qt::Key_Return); QCOMPARE(spyDirectoryEntered.count(), 1); spyDirectoryEntered.clear(); // lookInCombo - QComboBox *comboBox = qFindChild(&fd, "lookInCombo"); + QComboBox *comboBox = fd.findChild("lookInCombo"); comboBox->showPopup(); QVERIFY(comboBox->view()->model()->index(1, 0).isValid()); comboBox->view()->setCurrentIndex(comboBox->view()->model()->index(1, 0)); @@ -248,7 +248,7 @@ void tst_QFiledialog::directoryEnteredSignal() /* // platform specific fd.setViewMode(QFileDialog::ViewMode(QFileDialog::List)); - QListView* listView = qFindChild(&fd, "listView"); + QListView* listView = fd.findChild("listView"); QVERIFY(listView); QModelIndex root = listView->rootIndex(); QTRY_COMPARE(listView->model()->rowCount(root) > 0, true); @@ -293,7 +293,7 @@ void tst_QFiledialog::filesSelectedSignal() fd.show(); QVERIFY(QTest::qWaitForWindowExposed(&fd)); - QListView *listView = qFindChild(&fd, "listView"); + QListView *listView = fd.findChild("listView"); QVERIFY(listView); QModelIndex root = listView->rootIndex(); @@ -314,7 +314,7 @@ void tst_QFiledialog::filesSelectedSignal() listView->selectionModel()->select(file, QItemSelectionModel::Select | QItemSelectionModel::Rows); listView->setCurrentIndex(file); - QDialogButtonBox *buttonBox = qFindChild(&fd, "buttonBox"); + QDialogButtonBox *buttonBox = fd.findChild("buttonBox"); QPushButton *button = buttonBox->button(QDialogButtonBox::Open); QVERIFY(button); QVERIFY(button->isEnabled()); @@ -338,7 +338,7 @@ void tst_QFiledialog::filterSelectedSignal() fd.setNameFilters(filterChoices); QCOMPARE(fd.nameFilters(), filterChoices); - QComboBox *filters = qFindChild(&fd, "fileTypeCombo"); + QComboBox *filters = fd.findChild("fileTypeCombo"); QVERIFY(filters); QVERIFY(filters->view()); QCOMPARE(filters->isVisible(), true); @@ -367,7 +367,7 @@ void tst_QFiledialog::directory() { QNonNativeFileDialog fd; fd.setViewMode(QFileDialog::List); - QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); + QFileSystemModel *model = fd.findChild("qt_filesystem_model"); QVERIFY(model); fd.setDirectory(QDir::currentPath()); QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(QString))); @@ -392,7 +392,7 @@ void tst_QFiledialog::directory() QCOMPARE(spyFilterSelected.count(), 0); // Check my way - QList list = qFindChildren(&fd, "listView"); + QList list = fd.findChildren("listView"); QVERIFY(list.count() > 0); #ifdef Q_OS_WIN QCOMPARE(list.at(0)->rootIndex().data().toString().toLower(), temp.dirName().toLower()); @@ -476,9 +476,9 @@ void tst_QFiledialog::completer() fd.show(); QVERIFY(QTest::qWaitForWindowExposed(&fd)); QVERIFY(fd.isVisible()); - QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); + QFileSystemModel *model = fd.findChild("qt_filesystem_model"); QVERIFY(model); - QLineEdit *lineEdit = qFindChild(&fd, "fileNameEdit"); + QLineEdit *lineEdit = fd.findChild("fileNameEdit"); QVERIFY(lineEdit); QCompleter *completer = lineEdit->completer(); QVERIFY(completer); @@ -567,7 +567,7 @@ void tst_QFiledialog::completer_up() QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(QString))); fd.show(); - QLineEdit *lineEdit = qFindChild(&fd, "fileNameEdit"); + QLineEdit *lineEdit = fd.findChild("fileNameEdit"); QVERIFY(lineEdit); QCOMPARE(spyFilesSelected.count(), 0); int depth = QDir::currentPath().split('/').count(); @@ -586,7 +586,7 @@ void tst_QFiledialog::acceptMode() QNonNativeFileDialog fd; fd.show(); - QToolButton* newButton = qFindChild(&fd, "newFolderButton"); + QToolButton* newButton = fd.findChild("newFolderButton"); QVERIFY(newButton); // default @@ -658,7 +658,7 @@ void tst_QFiledialog::filters() QCOMPARE(fd.nameFilters(), QStringList("All Files (*)")); // effects - QList views = qFindChildren(&fd, "fileTypeCombo"); + QList views = fd.findChildren("fileTypeCombo"); QVERIFY(views.count() == 1); QCOMPARE(views.at(0)->isVisible(), false); @@ -728,7 +728,7 @@ void tst_QFiledialog::history() { QNonNativeFileDialog fd; fd.setViewMode(QFileDialog::List); - QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); + QFileSystemModel *model = fd.findChild("qt_filesystem_model"); QVERIFY(model); QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(QString))); QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(QString))); @@ -744,7 +744,7 @@ void tst_QFiledialog::history() if (fd.history() != history) { qDebug() << fd.history() << history; // quick and dirty output for windows failure. - QListView* list = qFindChild(&fd, "listView"); + QListView* list = fd.findChild("listView"); QVERIFY(list); QModelIndex root = list->rootIndex(); while (root.isValid()) { @@ -781,9 +781,9 @@ void tst_QFiledialog::isReadOnly() { QNonNativeFileDialog fd; - QPushButton* newButton = qFindChild(&fd, "newFolderButton"); - QAction* renameAction = qFindChild(&fd, "qt_rename_action"); - QAction* deleteAction = qFindChild(&fd, "qt_delete_action"); + QPushButton* newButton = fd.findChild("newFolderButton"); + QAction* renameAction = fd.findChild("qt_rename_action"); + QAction* deleteAction = fd.findChild("qt_delete_action"); QCOMPARE(fd.isReadOnly(), false); @@ -862,7 +862,7 @@ void tst_QFiledialog::selectFile() QFETCH(QString, file); QFETCH(int, count); QNonNativeFileDialog fd; - QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); + QFileSystemModel *model = fd.findChild("qt_filesystem_model"); QVERIFY(model); fd.setDirectory(QDir::currentPath()); // default value @@ -912,7 +912,7 @@ void tst_QFiledialog::selectFiles() QStringList list = fd.directory().entryList(QDir::Files); QModelIndexList toSelect; QVERIFY(list.count() > 1); - QListView* listView = qFindChild(&fd, "listView"); + QListView* listView = fd.findChild("listView"); QVERIFY(listView); for (int i = 0; i < list.count(); ++i) { fd.selectFile(fd.directory().path() + "/" + list.at(i)); @@ -945,7 +945,7 @@ void tst_QFiledialog::selectFiles() dialog->selectFile(temporary); dialog->show(); QVERIFY(QTest::qWaitForWindowExposed(dialog)); - QLineEdit *lineEdit = qFindChild(dialog, "fileNameEdit"); + QLineEdit *lineEdit = dialog->findChild("fileNameEdit"); QVERIFY(lineEdit); QCOMPARE(lineEdit->text(),QLatin1String("blah")); delete dialog; @@ -958,13 +958,13 @@ void tst_QFiledialog::viewMode() fd.show(); // find widgets - QList treeView = qFindChildren(&fd, "treeView"); + QList treeView = fd.findChildren("treeView"); QCOMPARE(treeView.count(), 1); - QList listView = qFindChildren(&fd, "listView"); + QList listView = fd.findChildren("listView"); QCOMPARE(listView.count(), 1); - QList listButton = qFindChildren(&fd, "listModeButton"); + QList listButton = fd.findChildren("listModeButton"); QCOMPARE(listButton.count(), 1); - QList treeButton = qFindChildren(&fd, "detailModeButton"); + QList treeButton = fd.findChildren("detailModeButton"); QCOMPARE(treeButton.count(), 1); // default value @@ -1069,7 +1069,7 @@ void tst_QFiledialog::focus() // make sure the tests work with focus follows mouse QCursor::setPos(fd.geometry().center()); - QList treeView = qFindChildren(&fd, "fileNameEdit"); + QList treeView = fd.findChildren("fileNameEdit"); QCOMPARE(treeView.count(), 1); QVERIFY(treeView.at(0)); QTRY_COMPARE(treeView.at(0)->hasFocus(), true); @@ -1080,11 +1080,11 @@ void tst_QFiledialog::focus() void tst_QFiledialog::historyBack() { QNonNativeFileDialog fd; - QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); + QFileSystemModel *model = fd.findChild("qt_filesystem_model"); QVERIFY(model); - QToolButton *backButton = qFindChild(&fd, "backButton"); + QToolButton *backButton = fd.findChild("backButton"); QVERIFY(backButton); - QToolButton *forwardButton = qFindChild(&fd, "forwardButton"); + QToolButton *forwardButton = fd.findChild("forwardButton"); QVERIFY(forwardButton); QSignalSpy spy(model, SIGNAL(rootPathChanged(QString))); @@ -1128,12 +1128,12 @@ void tst_QFiledialog::historyForward() { QNonNativeFileDialog fd; fd.setDirectory(QDir::currentPath()); - QToolButton *backButton = qFindChild(&fd, "backButton"); + QToolButton *backButton = fd.findChild("backButton"); QVERIFY(backButton); - QToolButton *forwardButton = qFindChild(&fd, "forwardButton"); + QToolButton *forwardButton = fd.findChild("forwardButton"); QVERIFY(forwardButton); - QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); + QFileSystemModel *model = fd.findChild("qt_filesystem_model"); QVERIFY(model); QSignalSpy spy(model, SIGNAL(rootPathChanged(QString))); @@ -1204,7 +1204,7 @@ void tst_QFiledialog::disableSaveButton() QNonNativeFileDialog fd(0, "caption", path); fd.setAcceptMode(QFileDialog::AcceptSave); - QDialogButtonBox *buttonBox = qFindChild(&fd, "buttonBox"); + QDialogButtonBox *buttonBox = fd.findChild("buttonBox"); QPushButton *button = buttonBox->button(QDialogButtonBox::Save); QVERIFY(button); QCOMPARE(button->isEnabled(), isEnabled); @@ -1235,7 +1235,7 @@ void tst_QFiledialog::saveButtonText() fd.setLabelText(QFileDialog::Accept, label); fd.setDirectory(QDir::temp()); fd.selectFile(path); - QDialogButtonBox *buttonBox = qFindChild(&fd, "buttonBox"); + QDialogButtonBox *buttonBox = fd.findChild("buttonBox"); QVERIFY(buttonBox); QPushButton *button = buttonBox->button(QDialogButtonBox::Save); QVERIFY(button); @@ -1253,12 +1253,12 @@ void tst_QFiledialog::clearLineEdit() //play it really safe by creating a directory QDir::home().mkdir("_____aaaaaaaaaaaaaaaaaaaaaa"); - QLineEdit *lineEdit = qFindChild(&fd, "fileNameEdit"); + QLineEdit *lineEdit = fd.findChild("fileNameEdit"); QVERIFY(lineEdit); QVERIFY(lineEdit->text() == "foo"); fd.setDirectory(QDir::home()); - QListView* list = qFindChild(&fd, "listView"); + QListView* list = fd.findChild("listView"); QVERIFY(list); // saving a file the text shouldn't be cleared @@ -1308,7 +1308,7 @@ void tst_QFiledialog::enableChooseButton() QNonNativeFileDialog fd; fd.setFileMode(QFileDialog::Directory); fd.show(); - QDialogButtonBox *buttonBox = qFindChild(&fd, "buttonBox"); + QDialogButtonBox *buttonBox = fd.findChild("buttonBox"); QPushButton *button = buttonBox->button(QDialogButtonBox::Open); QVERIFY(button); QCOMPARE(button->isEnabled(), true); diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index 018021ddac..98b096031e 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -257,7 +257,7 @@ void tst_QFileDialog2::deleteDirAndFiles() void tst_QFileDialog2::filter() { QNonNativeFileDialog fd; - QAction *hiddenAction = qFindChild(&fd, "qt_show_hidden_action"); + QAction *hiddenAction = fd.findChild("qt_show_hidden_action"); QVERIFY(hiddenAction); QVERIFY(hiddenAction->isEnabled()); QVERIFY(!hiddenAction->isChecked()); @@ -270,7 +270,7 @@ void tst_QFileDialog2::filter() void tst_QFileDialog2::showNameFilterDetails() { QNonNativeFileDialog fd; - QComboBox *filters = qFindChild(&fd, "fileTypeCombo"); + QComboBox *filters = fd.findChild("fileTypeCombo"); QVERIFY(filters); QVERIFY(fd.isNameFilterDetailsVisible()); @@ -302,7 +302,7 @@ void tst_QFileDialog2::unc() #endif QVERIFY(QFile::exists(dir)); QNonNativeFileDialog fd(0, QString(), dir); - QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); + QFileSystemModel *model = fd.findChild("qt_filesystem_model"); QVERIFY(model); QCOMPARE(model->index(fd.directory().absolutePath()), model->index(dir)); } @@ -311,12 +311,12 @@ void tst_QFileDialog2::emptyUncPath() { QNonNativeFileDialog fd; fd.show(); - QLineEdit *lineEdit = qFindChild(&fd, "fileNameEdit"); + QLineEdit *lineEdit = fd.findChild("fileNameEdit"); QVERIFY(lineEdit); // press 'keys' for the input for (int i = 0; i < 3 ; ++i) QTest::keyPress(lineEdit, Qt::Key_Backslash); - QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); + QFileSystemModel *model = fd.findChild("qt_filesystem_model"); QVERIFY(model); } @@ -327,7 +327,7 @@ struct MenuCloser : public QObject { void close() { - QMenu *menu = qFindChild(w); + QMenu *menu = w->findChild(); if (!menu) { qDebug("%s: cannot find file dialog child of type QMenu", Q_FUNC_INFO); w->close(); @@ -337,7 +337,7 @@ struct MenuCloser : public QObject { }; static bool openContextMenu(QFileDialog &fd) { - QListView *list = qFindChild(&fd, "listView"); + QListView *list = fd.findChild("listView"); if (!list) { qDebug("%s: didn't find file dialog child \"listView\"", Q_FUNC_INFO); return false; @@ -386,9 +386,9 @@ void tst_QFileDialog2::task143519_deleteAndRenameActionBehavior() QTest::qWaitForWindowActive(&fd); // grab some internals: - QAction *rm = qFindChild(&fd, "qt_delete_action"); + QAction *rm = fd.findChild("qt_delete_action"); QVERIFY(rm); - QAction *mv = qFindChild(&fd, "qt_rename_action"); + QAction *mv = fd.findChild("qt_rename_action"); QVERIFY(mv); // these are the real test cases: @@ -458,7 +458,7 @@ void tst_QFileDialog2::task180459_lastDirectory() { //first visit the temp directory and close the dialog QNonNativeFileDialog *dlg = new QNonNativeFileDialog(0, "", tempDir.path()); - QFileSystemModel *model = qFindChild(dlg, "qt_filesystem_model"); + QFileSystemModel *model = dlg->findChild("qt_filesystem_model"); QVERIFY(model); QCOMPARE(model->index(tempDir.path()), model->index(dlg->directory().absolutePath())); delete dlg; @@ -469,12 +469,12 @@ void tst_QFileDialog2::task180459_lastDirectory() QFETCH(QString, result); dlg = new QNonNativeFileDialog(0, "", path); - model = qFindChild(dlg, "qt_filesystem_model"); + model = dlg->findChild("qt_filesystem_model"); QVERIFY(model); dlg->setAcceptMode(QFileDialog::AcceptSave); QCOMPARE(model->index(dlg->directory().absolutePath()), model->index(directory)); - QDialogButtonBox *buttonBox = qFindChild(dlg, "buttonBox"); + QDialogButtonBox *buttonBox = dlg->findChild("buttonBox"); QPushButton *button = buttonBox->button(QDialogButtonBox::Save); QVERIFY(button); QCOMPARE(button->isEnabled(), isEnabled); @@ -564,7 +564,7 @@ void tst_QFileDialog2::task227304_proxyOnFileDialog() QNonNativeFileDialog fd(0, "", QDir::currentPath(), 0); fd.setProxyModel(new FilterDirModel(QDir::currentPath())); fd.show(); - QLineEdit *edit = qFindChild(&fd, "fileNameEdit"); + QLineEdit *edit = fd.findChild("fileNameEdit"); QTest::qWait(200); QTest::keyClick(edit, Qt::Key_T); QTest::keyClick(edit, Qt::Key_S); @@ -575,7 +575,7 @@ void tst_QFileDialog2::task227304_proxyOnFileDialog() dialog->setFileMode(QFileDialog::ExistingFile); dialog->show(); - QListView *list = qFindChild(dialog, "listView"); + QListView *list = dialog->findChild("listView"); QTest::qWait(200); QTest::keyClick(list, Qt::Key_Down); QTest::keyClick(list, Qt::Key_Return); @@ -588,7 +588,7 @@ void tst_QFileDialog2::task227304_proxyOnFileDialog() QSortFilterProxyModel *pm = new QSortFilterProxyModel; fd2.setProxyModel(pm); fd2.show(); - QSidebar *sidebar = qFindChild(&fd2, "sidebar"); + QSidebar *sidebar = fd2.findChild("sidebar"); sidebar->setFocus(); sidebar->selectUrl(QUrl::fromLocalFile(QDir::homePath())); QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, 0, sidebar->visualRect(sidebar->model()->index(1, 0)).center()); @@ -616,7 +616,7 @@ void tst_QFileDialog2::task227930_correctNavigationKeyboardBehavior() fd.setViewMode(QFileDialog::List); fd.setDirectory(current.absolutePath()); fd.show(); - QListView *list = qFindChild(&fd, "listView"); + QListView *list = fd.findChild("listView"); QTest::qWait(200); QTest::keyClick(list, Qt::Key_Down); QTest::keyClick(list, Qt::Key_Return); @@ -646,8 +646,8 @@ void tst_QFileDialog2::task226366_lowerCaseHardDriveWindows() QNonNativeFileDialog fd; fd.setDirectory(QDir::root().path()); fd.show(); - QLineEdit *edit = qFindChild(&fd, "fileNameEdit"); - QToolButton *buttonParent = qFindChild(&fd, "toParentButton"); + QLineEdit *edit = fd.findChild("fileNameEdit"); + QToolButton *buttonParent = fd.findChild("toParentButton"); QTest::qWait(200); QTest::mouseClick(buttonParent, Qt::LeftButton,0,QPoint(0,0)); QTest::qWait(2000); @@ -712,7 +712,7 @@ void tst_QFileDialog2::completionOnLevelAfterRoot() QSKIP("This test requires to have an etc directory under /"); #endif fd.show(); - QLineEdit *edit = qFindChild(&fd, "fileNameEdit"); + QLineEdit *edit = fd.findChild("fileNameEdit"); QTest::qWait(2000); #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) //I love testlib :D @@ -741,14 +741,14 @@ void tst_QFileDialog2::task233037_selectingDirectory() fd.setDirectory(current.absolutePath()); fd.setAcceptMode( QFileDialog::AcceptSave); fd.show(); - QListView *list = qFindChild(&fd, "listView"); + QListView *list = fd.findChild("listView"); QTest::qWait(3000); // Wait for sort to settle (I need a signal). #ifdef QT_KEYPAD_NAVIGATION list->setEditFocus(true); #endif QTest::keyClick(list, Qt::Key_Down); QTest::qWait(100); - QDialogButtonBox *buttonBox = qFindChild(&fd, "buttonBox"); + QDialogButtonBox *buttonBox = fd.findChild("buttonBox"); QPushButton *button = buttonBox->button(QDialogButtonBox::Save); QVERIFY(button); QCOMPARE(button->isEnabled(), true); @@ -763,7 +763,7 @@ void tst_QFileDialog2::task235069_hideOnEscape() fd.setDirectory(current.absolutePath()); fd.setAcceptMode( QFileDialog::AcceptSave); fd.show(); - QListView *list = qFindChild(&fd, "listView"); + QListView *list = fd.findChild("listView"); list->setFocus(); QTest::qWait(200); QTest::keyClick(list, Qt::Key_Escape); @@ -772,7 +772,7 @@ void tst_QFileDialog2::task235069_hideOnEscape() fd2.setDirectory(current.absolutePath()); fd2.setAcceptMode( QFileDialog::AcceptSave); fd2.show(); - QLineEdit *edit = qFindChild(&fd2, "fileNameEdit"); + QLineEdit *edit = fd2.findChild("fileNameEdit"); QTest::keyClick(edit, Qt::Key_Escape); QCOMPARE(fd2.isVisible(), false); } @@ -789,7 +789,7 @@ void tst_QFileDialog2::task236402_dontWatchDeletedDir() fd.setDirectory(current.absolutePath()); fd.setAcceptMode( QFileDialog::AcceptSave); fd.show(); - QListView *list = qFindChild(&fd, "listView"); + QListView *list = fd.findChild("listView"); list->setFocus(); QTest::qWait(200); QTest::keyClick(list, Qt::Key_Return); @@ -812,12 +812,12 @@ void tst_QFileDialog2::task203703_returnProperSeparator() fd.setFileMode(QFileDialog::Directory); fd.show(); QTest::qWait(500); - QListView *list = qFindChild(&fd, "listView"); + QListView *list = fd.findChild("listView"); list->setFocus(); QTest::qWait(200); QTest::keyClick(list, Qt::Key_Return); QTest::qWait(1000); - QDialogButtonBox *buttonBox = qFindChild(&fd, "buttonBox"); + QDialogButtonBox *buttonBox = fd.findChild("buttonBox"); QPushButton *button = buttonBox->button(QDialogButtonBox::Cancel); QTest::keyClick(button, Qt::Key_Return); QTest::qWait(500); @@ -852,10 +852,10 @@ void tst_QFileDialog2::task228844_ensurePreviousSorting() #else QTest::qWait(500); #endif - QTreeView *tree = qFindChild(&fd, "treeView"); + QTreeView *tree = fd.findChild("treeView"); tree->header()->setSortIndicator(3,Qt::DescendingOrder); QTest::qWait(200); - QDialogButtonBox *buttonBox = qFindChild(&fd, "buttonBox"); + QDialogButtonBox *buttonBox = fd.findChild("buttonBox"); QPushButton *button = buttonBox->button(QDialogButtonBox::Open); QTest::mouseClick(button, Qt::LeftButton); #if defined(Q_OS_WINCE) @@ -874,12 +874,12 @@ void tst_QFileDialog2::task228844_ensurePreviousSorting() #else QTest::qWait(500); #endif - QTreeView *tree2 = qFindChild(&fd2, "treeView"); + QTreeView *tree2 = fd2.findChild("treeView"); tree2->setFocus(); QCOMPARE(tree2->rootIndex().data(QFileSystemModel::FilePathRole).toString(),current.absolutePath()); - QDialogButtonBox *buttonBox2 = qFindChild(&fd2, "buttonBox"); + QDialogButtonBox *buttonBox2 = fd2.findChild("buttonBox"); QPushButton *button2 = buttonBox2->button(QDialogButtonBox::Open); fd2.selectFile("g"); QTest::mouseClick(button2, Qt::LeftButton); @@ -899,12 +899,12 @@ void tst_QFileDialog2::task228844_ensurePreviousSorting() #else QTest::qWait(500); #endif - QTreeView *tree3 = qFindChild(&fd3, "treeView"); + QTreeView *tree3 = fd3.findChild("treeView"); tree3->setFocus(); QCOMPARE(tree3->rootIndex().data(QFileSystemModel::FilePathRole).toString(), current.absolutePath()); - QDialogButtonBox *buttonBox3 = qFindChild(&fd3, "buttonBox"); + QDialogButtonBox *buttonBox3 = fd3.findChild("buttonBox"); QPushButton *button3 = buttonBox3->button(QDialogButtonBox::Open); QTest::mouseClick(button3, Qt::LeftButton); #if defined(Q_OS_WINCE) @@ -988,7 +988,7 @@ void tst_QFileDialog2::task251321_sideBarHiddenEntries() fd.show(); QTest::qWait(250); - QSidebar *sidebar = qFindChild(&fd, "sidebar"); + QSidebar *sidebar = fd.findChild("sidebar"); sidebar->setFocus(); sidebar->selectUrl(QUrl::fromLocalFile(hiddenSubDir.absolutePath())); QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, 0, sidebar->visualRect(sidebar->model()->index(0, 0)).center()); @@ -999,7 +999,7 @@ void tst_QFileDialog2::task251321_sideBarHiddenEntries() QTest::qWait(250); #endif - QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); + QFileSystemModel *model = fd.findChild("qt_filesystem_model"); QCOMPARE(model->rowCount(model->index(hiddenSubDir.absolutePath())), 2); hiddenSubDir.rmdir("happy2"); @@ -1045,14 +1045,14 @@ void tst_QFileDialog2::task251341_sideBarRemoveEntries() fd.show(); QTest::qWait(250); - QSidebar *sidebar = qFindChild(&fd, "sidebar"); + QSidebar *sidebar = fd.findChild("sidebar"); sidebar->setFocus(); //We enter in the first bookmark sidebar->selectUrl(QUrl::fromLocalFile(testSubDir.absolutePath())); QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, 0, sidebar->visualRect(sidebar->model()->index(0, 0)).center()); QTest::qWait(250); - QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); + QFileSystemModel *model = fd.findChild("qt_filesystem_model"); //There is no file QCOMPARE(model->rowCount(model->index(testSubDir.absolutePath())), 0); //Icon is not enabled QUrlModel::EnabledRole @@ -1116,10 +1116,10 @@ void tst_QFileDialog2::task254490_selectFileMultipleTimes() fd.show(); QTest::qWait(250); - QLineEdit *lineEdit = qFindChild(&fd, "fileNameEdit"); + QLineEdit *lineEdit = fd.findChild("fileNameEdit"); QVERIFY(lineEdit); QCOMPARE(lineEdit->text(),QLatin1String("new_file.txt")); - QListView *list = qFindChild(&fd, "listView"); + QListView *list = fd.findChild("listView"); QVERIFY(list); QCOMPARE(list->selectionModel()->selectedRows(0).count(), 0); @@ -1136,7 +1136,7 @@ void tst_QFileDialog2::task257579_sideBarWithNonCleanUrls() QString url = QString::fromLatin1("%1/%2/..").arg(dir.absolutePath()).arg(dirname); QNonNativeFileDialog fd; fd.setSidebarUrls(QList() << QUrl::fromLocalFile(url)); - QSidebar *sidebar = qFindChild(&fd, "sidebar"); + QSidebar *sidebar = fd.findChild("sidebar"); QCOMPARE(sidebar->urls().count(), 1); QVERIFY(sidebar->urls().first().toLocalFile() != url); QCOMPARE(sidebar->urls().first().toLocalFile(), QDir::cleanPath(url)); @@ -1161,7 +1161,7 @@ void tst_QFileDialog2::task259105_filtersCornerCases() QTest::qWait(250); //Extensions are hidden - QComboBox *filters = qFindChild(&fd, "fileTypeCombo"); + QComboBox *filters = fd.findChild("fileTypeCombo"); QVERIFY(filters); QCOMPARE(filters->currentText(), QLatin1String("All Files!")); filters->setCurrentIndex(1); @@ -1215,7 +1215,7 @@ void tst_QFileDialog2::QTBUG4419_lineEditSelectAll() QCOMPARE(fd.isVisible(), true); QCOMPARE(QApplication::activeWindow(), static_cast(&fd)); - QLineEdit *lineEdit = qFindChild(&fd, "fileNameEdit"); + QLineEdit *lineEdit = fd.findChild("fileNameEdit"); QVERIFY(lineEdit); QTRY_COMPARE(tempPath + QChar('/') + lineEdit->text(), t->fileName()); @@ -1258,7 +1258,7 @@ void tst_QFileDialog2::QTBUG6558_showDirsOnly() QCOMPARE(fd.isVisible(), true); QCOMPARE(QApplication::activeWindow(), static_cast(&fd)); - QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); + QFileSystemModel *model = fd.findChild("qt_filesystem_model"); QTRY_COMPARE(model->rowCount(model->index(dir.absolutePath())), 2); fd.setOption(QFileDialog::ShowDirsOnly, false); @@ -1306,7 +1306,7 @@ void tst_QFileDialog2::QTBUG4842_selectFilterWithHideNameFilterDetails() QCOMPARE(fd.isVisible(), true); QCOMPARE(QApplication::activeWindow(), static_cast(&fd)); - QComboBox *filters = qFindChild(&fd, "fileTypeCombo"); + QComboBox *filters = fd.findChild("fileTypeCombo"); //We compare the current combobox text with the stripped version QCOMPARE(filters->currentText(), QString("Text files")); @@ -1322,7 +1322,7 @@ void tst_QFileDialog2::QTBUG4842_selectFilterWithHideNameFilterDetails() QCOMPARE(fd2.isVisible(), true); QCOMPARE(QApplication::activeWindow(), static_cast(&fd2)); - QComboBox *filters2 = qFindChild(&fd2, "fileTypeCombo"); + QComboBox *filters2 = fd2.findChild("fileTypeCombo"); //We compare the current combobox text with the non stripped version QCOMPARE(filters2->currentText(), chosenFilterString); @@ -1340,7 +1340,7 @@ void tst_QFileDialog2::dontShowCompleterOnRoot() QCOMPARE(QApplication::activeWindow(), static_cast(&fd)); fd.setDirectory(""); - QLineEdit *lineEdit = qFindChild(&fd, "fileNameEdit"); + QLineEdit *lineEdit = fd.findChild("fileNameEdit"); QTRY_VERIFY(lineEdit->text().isEmpty()); //The gatherer thread will then return the result diff --git a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp index 581696c509..7d8077d77d 100644 --- a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp +++ b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp @@ -153,13 +153,13 @@ void testInvalidateAndRestore( template void testGetNumeric(QInputDialog *dialog, SpinBoxType * = 0, ValueType * = 0) { - SpinBoxType *sbox = qFindChild(dialog); + SpinBoxType *sbox = dialog->findChild(); QVERIFY(sbox != 0); - QLineEdit *ledit = qFindChild(static_cast(sbox)); + QLineEdit *ledit = static_cast(sbox)->findChild(); QVERIFY(ledit != 0); - QDialogButtonBox *bbox = qFindChild(dialog); + QDialogButtonBox *bbox = dialog->findChild(); QVERIFY(bbox != 0); QPushButton *okButton = bbox->button(QDialogButtonBox::Ok); QVERIFY(okButton != 0); @@ -189,10 +189,10 @@ void testGetNumeric(QInputDialog *dialog, SpinBoxType * = 0, ValueType * = 0) void testGetText(QInputDialog *dialog) { - QLineEdit *ledit = qFindChild(dialog); + QLineEdit *ledit = dialog->findChild(); QVERIFY(ledit); - QDialogButtonBox *bbox = qFindChild(dialog); + QDialogButtonBox *bbox = dialog->findChild(); QVERIFY(bbox); QPushButton *okButton = bbox->button(QDialogButtonBox::Ok); QVERIFY(okButton); @@ -207,10 +207,10 @@ void testGetText(QInputDialog *dialog) void testGetItem(QInputDialog *dialog) { - QComboBox *cbox = qFindChild(dialog); + QComboBox *cbox = dialog->findChild(); QVERIFY(cbox); - QDialogButtonBox *bbox = qFindChild(dialog); + QDialogButtonBox *bbox = dialog->findChild(); QVERIFY(bbox); QPushButton *okButton = bbox->button(QDialogButtonBox::Ok); QVERIFY(okButton); @@ -245,7 +245,7 @@ void tst_QInputDialog::testFuncGetItem(QInputDialog *dialog) void tst_QInputDialog::timerEvent(QTimerEvent *event) { killTimer(event->timerId()); - QInputDialog *dialog = qFindChild(parent); + QInputDialog *dialog = parent->findChild(); QVERIFY(dialog); if (testFunc) testFunc(dialog); diff --git a/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp index 09f115a489..d49f356d8c 100644 --- a/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp +++ b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp @@ -141,7 +141,7 @@ void tst_QProgressDialog::task198202() QProgressDialog dlg(QLatin1String("test"),QLatin1String("test"),1,10); dlg.show(); QVERIFY(QTest::qWaitForWindowExposed(&dlg)); - int futureHeight = dlg.sizeHint().height() - qFindChild(&dlg)->sizeHint().height(); + int futureHeight = dlg.sizeHint().height() - dlg.findChild()->sizeHint().height(); dlg.setLabel(0); QTest::ignoreMessage(QtWarningMsg, "QProgressDialog::setBar: Cannot set a null progress bar"); dlg.setBar(0); diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index ae5853f3c8..c3fc050275 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -2518,7 +2518,7 @@ void tst_QWizard::task161658_alignments() wizard.show(); QVERIFY(QTest::qWaitForWindowExposed(&wizard)); - foreach (QLabel *subtitleLabel, qFindChildren(&wizard)) { + foreach (QLabel *subtitleLabel, wizard.findChildren()) { if (subtitleLabel->text().startsWith("SUBTITLE#")) { QCOMPARE(lineEdit1.mapToGlobal(lineEdit1.contentsRect().bottomRight()).x(), subtitleLabel->mapToGlobal(subtitleLabel->contentsRect().bottomRight()).x()); diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index a859fb922a..beea46c979 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -3081,7 +3081,7 @@ protected: private slots: void checkMenu() { - if (qFindChild(this)) + if (this->findChild()) embeddedPopup = true; hide(); } diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 47f7618f00..9e06435ca7 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -845,7 +845,7 @@ void tst_QGraphicsView::dragMode_rubberBand() QCOMPARE(view.verticalScrollBar()->value(), verticalScrollBarValue); // We don't use QRubberBand as of 4.3; the band is drawn internally. - QVERIFY(!qFindChild(&view)); + QVERIFY(!view.findChild()); QTest::qWait(25); 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 list = qFindChildren(view.viewport()); + QList list = view.viewport()->findChildren(); 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 lineEditors = qFindChildren(treeView.viewport()); + QList lineEditors = treeView.viewport()->findChildren(); QCOMPARE(lineEditors.count(), 1); QVERIFY(!lineEditors.first()->size().isEmpty()); QTest::qWait(30); treeView.edit(model.index(1,0)); - lineEditors = qFindChildren(treeView.viewport()); + lineEditors = treeView.viewport()->findChildren(); QCOMPARE(lineEditors.count(), 1); QVERIFY(!lineEditors.first()->size().isEmpty()); QTest::qWait(30); treeView.edit(model.index(2,0)); - lineEditors = qFindChildren(treeView.viewport()); + lineEditors = treeView.viewport()->findChildren(); 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 lineEditors = qFindChildren(view.viewport()); + QList lineEditors = view.viewport()->findChildren(); 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 editors = qFindChildren(view.viewport()); + QList editors = view.viewport()->findChildren(); QCOMPARE(editors.count(), 1); QDoubleSpinBox *editor = editors.at(0); @@ -776,7 +776,7 @@ void tst_QItemDelegate::dateTimeEditor() QTestEventLoop::instance().enterLoop(1); - QTimeEdit *timeEditor = qFindChild(widget.viewport()); + QTimeEdit *timeEditor = widget.viewport()->findChild(); 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(widget.viewport()); + QDateEdit *dateEditor = widget.viewport()->findChild(); 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 lineEditors = qFindChildren(view.viewport(), QString::fromLatin1("TheEditor")); + QList lineEditors = view.viewport()->findChildren(QString::fromLatin1("TheEditor")); QCOMPARE(lineEditors.count(), 1); QPointer editor = lineEditors.at(0); @@ -1344,7 +1344,7 @@ void tst_QItemDelegate::task257859_finalizeEdit() view.edit(index); QTest::qWait(30); - QList lineEditors = qFindChildren(view.viewport()); + QList lineEditors = view.viewport()->findChildren(); QCOMPARE(lineEditors.count(), 1); QPointer editor = lineEditors.at(0); @@ -1397,7 +1397,7 @@ void tst_QItemDelegate::comboBox() QTestEventLoop::instance().enterLoop(1); - QComboBox *boolEditor = qFindChild(widget.viewport()); + QComboBox *boolEditor = widget.viewport()->findChild(); 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 editor = qFindChild(&view); + QPointer editor = view.findChild(); 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(&view, QString())); + QVERIFY(!view.findChild(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(&view, QString()) != 0, editorOpened); + QTRY_COMPARE(view.findChild(QString()) != 0, editorOpened); } void tst_QTreeView::hasAutoScroll() @@ -1228,15 +1228,15 @@ void tst_QTreeView::openPersistentEditor() view.setModel(&treeModel); view.show(); - QVERIFY(!qFindChild(view.viewport())); + QVERIFY(!view.viewport()->findChild()); view.openPersistentEditor(view.model()->index(0, 0)); - QVERIFY(qFindChild(view.viewport())); + QVERIFY(view.viewport()->findChild()); view.closePersistentEditor(view.model()->index(0, 0)); - QVERIFY(!qFindChild(view.viewport())->isVisible()); + QVERIFY(!view.viewport()->findChild()->isVisible()); qApp->sendPostedEvents(0, QEvent::DeferredDelete); - QVERIFY(!qFindChild(view.viewport())); + QVERIFY(!view.viewport()->findChild()); } 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(&tree); + QLineEdit *editor = tree.findChild(); 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(&tree); + QWidget *editor = tree.findChild(); QVERIFY(editor != 0); tree.closePersistentEditor(item, col); } diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index b92a6ed222..c6835f6076 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -1241,7 +1241,7 @@ public slots: void DeleteLaterWidget::runTest() { - QObject *stillAlive = qFindChild(this, "deleteLater"); + QObject *stillAlive = this->findChild("deleteLater"); QWidget *w = new QWidget(this); connect(w, SIGNAL(destroyed()), this, SLOT(childDeleted())); @@ -1287,7 +1287,7 @@ void tst_QApplication::testDeleteLater() object->setObjectName("deleteLater"); object->deleteLater(); - QObject *stillAlive = qFindChild(wgt, "deleteLater"); + QObject *stillAlive = wgt->findChild("deleteLater"); QVERIFY(stillAlive); app.exec(); diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 3d3c858913..69d890fb7a 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -6130,7 +6130,7 @@ static void workaroundPaletteIssue(QWidget *widget) if (!widget) return; - QWidget *navigationBar = qFindChild(widget, QLatin1String("qt_calendar_navigationbar")); + QWidget *navigationBar = widget->findChild(QLatin1String("qt_calendar_navigationbar")); QVERIFY(navigationBar); QPalette palette = navigationBar->palette(); @@ -6229,7 +6229,7 @@ void tst_QWidget::renderInvisible() } // Get navigation bar and explicitly hide it. - QWidget *navigationBar = qFindChild(calendar.data(), QLatin1String("qt_calendar_navigationbar")); + QWidget *navigationBar = calendar.data()->findChild(QLatin1String("qt_calendar_navigationbar")); QVERIFY(navigationBar); navigationBar->hide(); @@ -6252,7 +6252,7 @@ void tst_QWidget::renderInvisible() } // Get next month button. - QWidget *nextMonthButton = qFindChild(navigationBar, QLatin1String("qt_calendar_nextmonth")); + QWidget *nextMonthButton = navigationBar->findChild(QLatin1String("qt_calendar_nextmonth")); QVERIFY(nextMonthButton); { // Render next month button. diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp index c733fadbf5..ef91d6d3d2 100644 --- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp +++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp @@ -689,7 +689,7 @@ void tst_QStyle::lineUpLayoutTest(QStyle *style) widget.setLayout(&layout); widget.setStyle(style); // propagate the style. - foreach (QWidget *w, qFindChildren(&widget)) + foreach (QWidget *w, widget.findChildren()) w->setStyle(style); widget.show(); QVERIFY(QTest::qWaitForWindowExposed(&widget)); diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp index 305bee4e49..24e3ac2c99 100644 --- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -656,7 +656,7 @@ void tst_QStyleSheetStyle::fontPropagation() QTabWidget tw; tw.setStyleSheet("QTabWidget { font-size: 20pt; }"); QVERIFY(FONTSIZE(tw) == 20); - QWidget *child = qFindChild(&tw, "qt_tabwidget_tabbar"); + QWidget *child = tw.findChild("qt_tabwidget_tabbar"); QVERIFY2(child, "QTabWidget did not contain a widget named \"qt_tabwidget_tabbar\""); QVERIFY(FONTSIZE(*child) == 20); } @@ -957,7 +957,7 @@ void tst_QStyleSheetStyle::tabAlignement() tabWidget.resize(QSize(400,400)); topLevel.show(); QVERIFY(QTest::qWaitForWindowExposed(&topLevel)); - QTabBar *bar = qFindChild(&tabWidget); + QTabBar *bar = tabWidget.findChild(); QVERIFY(bar); //check the tab is on the right tabWidget.setStyleSheet("QTabWidget::tab-bar { alignment: right ; }"); @@ -1030,7 +1030,7 @@ void tst_QStyleSheetStyle::minmaxSizes() QVERIFY(qAbs(page3->maximumSize().height() - 500 - 2) <= 2); QVERIFY(qAbs(page3->minimumSize().height() - 250 - 2) <= 2); QVERIFY(qAbs(page3->minimumSize().height() - 250 - 2) <= 2); - QTabBar *bar = qFindChild(&tabWidget); + QTabBar *bar = tabWidget.findChild(); QVERIFY(bar); #ifdef Q_OS_MAC QEXPECT_FAIL("", "QTBUG-23686", Continue); diff --git a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp index 1d4a022aaf..14a8496b42 100644 --- a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp +++ b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp @@ -183,24 +183,24 @@ void tst_QCalendarWidget::buttonClickCheck() QDate selectedDate(2005, 1, 1); //click on the month buttons int month = object.monthShown(); - QToolButton *button = qFindChild(&object, "qt_calendar_prevmonth"); + QToolButton *button = object.findChild("qt_calendar_prevmonth"); QTest::mouseClick(button, Qt::LeftButton); QCOMPARE(month > 1 ? month-1 : 12, object.monthShown()); - button = qFindChild(&object, "qt_calendar_nextmonth"); + button = object.findChild("qt_calendar_nextmonth"); QTest::mouseClick(button, Qt::LeftButton); QCOMPARE(month, object.monthShown()); - button = qFindChild(&object, "qt_calendar_yearbutton"); + button = object.findChild("qt_calendar_yearbutton"); QTest::mouseClick(button, Qt::LeftButton, Qt::NoModifier, button->rect().center(), 2); QVERIFY(!button->isVisible()); - QSpinBox *spinbox = qFindChild(&object, "qt_calendar_yearedit"); + QSpinBox *spinbox = object.findChild("qt_calendar_yearedit"); QTest::qWait(500); QTest::keyClick(spinbox, '2'); QTest::keyClick(spinbox, '0'); QTest::keyClick(spinbox, '0'); QTest::keyClick(spinbox, '6'); QTest::qWait(500); - QWidget *widget = qFindChild(&object, "qt_calendar_calendarview"); + QWidget *widget = object.findChild("qt_calendar_calendarview"); QTest::mouseMove(widget); QTest::mouseClick(widget, Qt::LeftButton); QCOMPARE(2006, object.yearShown()); @@ -212,11 +212,11 @@ void tst_QCalendarWidget::buttonClickCheck() object.setDateRange(QDate(2006,1,1), QDate(2006,2,28)); object.setSelectedDate(QDate(2006,1,1)); object.showSelectedDate(); - button = qFindChild(&object, "qt_calendar_prevmonth"); + button = object.findChild("qt_calendar_prevmonth"); QTest::mouseClick(button, Qt::LeftButton); QCOMPARE(1, object.monthShown()); - button = qFindChild(&object, "qt_calendar_nextmonth"); + button = object.findChild("qt_calendar_nextmonth"); QTest::mouseClick(button, Qt::LeftButton); QCOMPARE(2, object.monthShown()); QTest::mouseClick(button, Qt::LeftButton); @@ -351,7 +351,7 @@ void tst_QCalendarWidget::showPrevNext() // QTBUG-4058 QTest::qWait(20); - QToolButton *button = qFindChild(&calWidget, "qt_calendar_prevmonth"); + QToolButton *button = calWidget.findChild("qt_calendar_prevmonth"); QTest::mouseClick(button, Qt::LeftButton); expectedDate = expectedDate.addMonths(-1); QCOMPARE(calWidget.yearShown(), expectedDate.year()); diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index df53093e20..7c468fcaed 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -2064,10 +2064,10 @@ void tst_QComboBox::task190351_layout() QApplication::processEvents(); #ifdef QT_BUILD_INTERNAL - QFrame *container = qFindChild(&listCombo); + QFrame *container = listCombo.findChild(); QVERIFY(container); - QCOMPARE(static_cast(list), qFindChild(container)); - QWidget *top = qFindChild(container); + QCOMPARE(static_cast(list), container->findChild()); + QWidget *top = container->findChild(); QVERIFY(top); QVERIFY(top->isVisible()); QCOMPARE(top->mapToGlobal(QPoint(0, top->height())).y(), list->mapToGlobal(QPoint()).y()); @@ -2138,10 +2138,10 @@ void tst_QComboBox::task191329_size() QTRY_VERIFY(tableCombo.view()->isVisible()); #ifdef QT_BUILD_INTERNAL - QFrame *container = qFindChild(&tableCombo); + QFrame *container = tableCombo.findChild(); QVERIFY(container); - QCOMPARE(static_cast(table), qFindChild(container)); - foreach (QWidget *button, qFindChildren(container)) { + QCOMPARE(static_cast(table), container->findChild()); + foreach (QWidget *button, container->findChildren()) { //the popup should be large enough to contains everithing so the top and left button are hidden QVERIFY(!button->isVisible()); } @@ -2201,7 +2201,7 @@ void tst_QComboBox::task248169_popupWithMinimalSize() QTRY_VERIFY(comboBox.view()->isVisible()); #ifdef QT_BUILD_INTERNAL - QFrame *container = qFindChild(&comboBox); + QFrame *container = comboBox.findChild(); QVERIFY(container); QTRY_VERIFY(desktop.screenGeometry(container).contains(container->geometry())); #endif diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index 53c3eb1ed0..bfffa357a8 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -2818,7 +2818,7 @@ void tst_QDateTimeEdit::calendarPopup() opt.subControls = QStyle::SC_ComboBoxArrow; QRect rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, testWidget); QTest::mouseClick(testWidget, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2)); - QWidget *wid = qFindChild(testWidget, "qt_datetimedit_calendar"); + QWidget *wid = testWidget->findChild("qt_datetimedit_calendar"); QVERIFY(wid != 0); testWidget->hide(); @@ -2830,7 +2830,7 @@ void tst_QDateTimeEdit::calendarPopup() opt.subControls = QStyle::SC_ComboBoxArrow; rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, &timeEdit); QTest::mouseClick(&timeEdit, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2)); - QWidget *wid2 = qFindChild(&timeEdit, "qt_datetimedit_calendar"); + QWidget *wid2 = timeEdit.findChild("qt_datetimedit_calendar"); QVERIFY(wid2 == 0); timeEdit.hide(); @@ -2844,7 +2844,7 @@ void tst_QDateTimeEdit::calendarPopup() opt.subControls = QStyle::SC_ComboBoxArrow; rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, &dateEdit); QTest::mouseClick(&dateEdit, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2)); - QWidget *wid3 = qFindChild(&dateEdit, "qt_datetimedit_calendar"); + QWidget *wid3 = dateEdit.findChild("qt_datetimedit_calendar"); QVERIFY(wid3 == 0); dateEdit.hide(); } diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp index 59be9bd659..b0e454b643 100644 --- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp +++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp @@ -265,7 +265,7 @@ void tst_QDialogButtonBox::addButton1() QPushButton *button = new QPushButton(); buttonBox.addButton(button, role); QTEST(buttonBox.buttons().count(), "totalCount"); - QList children = qFindChildren(&buttonBox); + QList children = buttonBox.findChildren(); QTEST(children.count(), "totalCount"); delete button; } @@ -292,7 +292,7 @@ void tst_QDialogButtonBox::addButton2() QCOMPARE(buttonBox.buttons().count(), 0); buttonBox.addButton(text, role); QTEST(buttonBox.buttons().count(), "totalCount"); - QList children = qFindChildren(&buttonBox); + QList children = buttonBox.findChildren(); QTEST(children.count(), "totalCount"); } @@ -319,7 +319,7 @@ void tst_QDialogButtonBox::addButton3() QCOMPARE(buttonBox.buttons().count(), 0); buttonBox.addButton(button); QTEST(buttonBox.buttons().count(), "totalCount"); - QList children = qFindChildren(&buttonBox); + QList children = buttonBox.findChildren(); QTEST(children.count(), "totalCount"); } @@ -341,7 +341,7 @@ void tst_QDialogButtonBox::clear() buttonBox.addButton("Happy", QDialogButtonBox::ButtonRole(i)); buttonBox.clear(); QCOMPARE(buttonBox.buttons().count(), 0); - QList children = qFindChildren(&buttonBox); + QList children = buttonBox.findChildren(); QCOMPARE(children.count(), 0); } @@ -376,11 +376,11 @@ void tst_QDialogButtonBox::testDelete() QPushButton *deleteMe = new QPushButton("Happy"); buttonBox.addButton(deleteMe, QDialogButtonBox::HelpRole); QCOMPARE(buttonBox.buttons().count(), 1); - QList children = qFindChildren(&buttonBox); + QList children = buttonBox.findChildren(); QCOMPARE(children.count(), 1); delete deleteMe; - children = qFindChildren(&buttonBox); + children = buttonBox.findChildren(); QCOMPARE(children.count(), 0); QCOMPARE(buttonBox.buttons().count(), 0); } diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index 896d4e8e6f..b42bfcac81 100644 --- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -731,7 +731,7 @@ void tst_QMainWindow::statusBar() // deleting the status bar should remove it from the main window QMainWindow mw; QStatusBar *sb = mw.statusBar(); - QMainWindowLayout *l = qFindChild(&mw); + QMainWindowLayout *l = mw.findChild(); QVERIFY(l); int indexOfSb = l->indexOf(sb); QVERIFY(indexOfSb != -1); @@ -1425,7 +1425,7 @@ void AddDockWidget::apply(QMainWindow *mw) const QDockWidget *other = 0; if (mode == SplitMode || mode == TabMode) { - other = qFindChild(mw, this->other); + other = mw->findChild(this->other); QVERIFY(other != 0); } @@ -1463,14 +1463,14 @@ Q_DECLARE_METATYPE(MoveList) void MoveSeparator::apply(QMainWindow *mw) const { - QMainWindowLayout *l = qFindChild(mw); + QMainWindowLayout *l = mw->findChild(); QVERIFY(l); QList path; if (name.isEmpty()) { path << area; } else { - QDockWidget *dw = qFindChild(mw, name); + QDockWidget *dw = mw->findChild(name); QVERIFY(dw != 0); path = l->layoutState.dockAreaLayout.indexOf(dw); } @@ -1488,7 +1488,7 @@ void MoveSeparator::apply(QMainWindow *mw) const QMap dockWidgetGeometries(QMainWindow *mw) { QMap result; - QList dockWidgets = qFindChildren(mw); + QList dockWidgets = mw->findChildren(); foreach (QDockWidget *dw, dockWidgets) result.insert(dw->objectName(), dw->geometry()); return result; diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 72945a9fd2..6364a736cd 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -111,7 +111,7 @@ static bool tabBetweenSubWindowsIn(QMdiArea *mdiArea, int tabCount = -1, bool re if (tabCount > 1) QTest::qWait(500); if (walkThrough) { - QRubberBand *rubberBand = qFindChild(mdiArea->viewport()); + QRubberBand *rubberBand = mdiArea->viewport()->findChild(); if (!rubberBand) { qWarning("No rubber band"); return false; @@ -2334,14 +2334,14 @@ void tst_QMdiArea::setViewMode() // Default. QVERIFY(!activeSubWindow->isMaximized()); - QTabBar *tabBar = qFindChild(&mdiArea); + QTabBar *tabBar = mdiArea.findChild(); QVERIFY(!tabBar); QCOMPARE(mdiArea.viewMode(), QMdiArea::SubWindowView); // Tabbed view. mdiArea.setViewMode(QMdiArea::TabbedView); QCOMPARE(mdiArea.viewMode(), QMdiArea::TabbedView); - tabBar = qFindChild(&mdiArea); + tabBar = mdiArea.findChild(); QVERIFY(tabBar); QVERIFY(tabBar->isVisible()); @@ -2408,7 +2408,7 @@ void tst_QMdiArea::setViewMode() // Go back to default (QMdiArea::SubWindowView). mdiArea.setViewMode(QMdiArea::SubWindowView); QVERIFY(!activeSubWindow->isMaximized()); - tabBar = qFindChild(&mdiArea); + tabBar = mdiArea.findChild(); QVERIFY(!tabBar); QCOMPARE(mdiArea.viewMode(), QMdiArea::SubWindowView); } @@ -2422,14 +2422,14 @@ void tst_QMdiArea::setTabsClosable() QCOMPARE(mdiArea.tabsClosable(), false); // change value before tab bar exists - QTabBar *tabBar = qFindChild(&mdiArea); + QTabBar *tabBar = mdiArea.findChild(); QVERIFY(!tabBar); mdiArea.setTabsClosable(true); QCOMPARE(mdiArea.tabsClosable(), true); // force tab bar creation mdiArea.setViewMode(QMdiArea::TabbedView); - tabBar = qFindChild(&mdiArea); + tabBar = mdiArea.findChild(); QVERIFY(tabBar); // value must've been propagated @@ -2452,14 +2452,14 @@ void tst_QMdiArea::setTabsMovable() QCOMPARE(mdiArea.tabsMovable(), false); // change value before tab bar exists - QTabBar *tabBar = qFindChild(&mdiArea); + QTabBar *tabBar = mdiArea.findChild(); QVERIFY(!tabBar); mdiArea.setTabsMovable(true); QCOMPARE(mdiArea.tabsMovable(), true); // force tab bar creation mdiArea.setViewMode(QMdiArea::TabbedView); - tabBar = qFindChild(&mdiArea); + tabBar = mdiArea.findChild(); QVERIFY(tabBar); // value must've been propagated @@ -2500,7 +2500,7 @@ void tst_QMdiArea::setTabShape() mdiArea.setViewMode(QMdiArea::TabbedView); - QTabBar *tabBar = qFindChild(&mdiArea); + QTabBar *tabBar = mdiArea.findChild(); QVERIFY(tabBar); QCOMPARE(tabBar->shape(), QTabBar::TriangularNorth); @@ -2543,7 +2543,7 @@ void tst_QMdiArea::setTabPosition() // Default. QCOMPARE(mdiArea.tabPosition(), QTabWidget::North); mdiArea.setViewMode(QMdiArea::TabbedView); - QTabBar *tabBar = qFindChild(&mdiArea); + QTabBar *tabBar = mdiArea.findChild(); QVERIFY(tabBar); QCOMPARE(tabBar->shape(), QTabBar::RoundedNorth); diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp index 477bab8a37..5b146cf443 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp @@ -598,7 +598,7 @@ void tst_QMdiSubWindow::showShaded() QWidget *mouseReceiver = 0; #ifdef Q_OS_MAC if (window->style()->inherits("QMacStyle")) - mouseReceiver = qFindChild(window); + mouseReceiver = window->findChild(); else #endif mouseReceiver = window; @@ -707,7 +707,7 @@ void tst_QMdiSubWindow::setOpaqueResizeAndMove() QWidget *mouseReceiver = 0; if (window->style()->inherits("QMacStyle")) - mouseReceiver = qFindChild(window); + mouseReceiver = window->findChild(); else mouseReceiver = window; QVERIFY(mouseReceiver); @@ -1447,12 +1447,12 @@ void tst_QMdiSubWindow::defaultSizeGrip() // QSizeGrip on windows with decoration. QMdiSubWindow *windowWithDecoration = mdiArea.addSubWindow(new QWidget); windowWithDecoration->show(); - QVERIFY(qFindChild(windowWithDecoration)); + QVERIFY(windowWithDecoration->findChild()); // ...but not on windows without decoration (Qt::FramelessWindowHint). QMdiSubWindow *windowWithoutDecoration = mdiArea.addSubWindow(new QWidget, Qt::FramelessWindowHint); windowWithoutDecoration->show(); - QVERIFY(!qFindChild(windowWithoutDecoration)); + QVERIFY(!windowWithoutDecoration->findChild()); } #endif diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp index fdb17d1eaf..11c4e238ec 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp @@ -1119,7 +1119,7 @@ void tst_QPlainTextEdit::mimeDataReimplementations() QCOMPARE(ed.insertCallCount, 0); #ifdef QT_BUILD_INTERNAL - QWidgetTextControl *control = qFindChild(&ed); + QWidgetTextControl *control = ed.findChild(); QVERIFY(control); control->canInsertFromMimeData(QApplication::clipboard()->mimeData()); diff --git a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp index 62dfd07f3e..3bdf583153 100644 --- a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp +++ b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp @@ -175,7 +175,7 @@ void tst_QStatusBar::setSizeGripEnabled() QVERIFY(QTest::qWaitForWindowExposed(&mainWindow)); QTRY_VERIFY(statusBar->isVisible()); - QPointer sizeGrip = qFindChild(statusBar); + QPointer sizeGrip = statusBar->findChild(); QVERIFY(sizeGrip); QVERIFY(sizeGrip->isVisible()); @@ -211,7 +211,7 @@ void tst_QStatusBar::setSizeGripEnabled() statusBar = mainWindow.statusBar(); QVERIFY(statusBar); - sizeGrip = qFindChild(statusBar); + sizeGrip = statusBar->findChild(); QVERIFY(sizeGrip); QVERIFY(!sizeGrip->isVisible()); diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index b8ff6f1c33..11bb5c88a1 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -1483,7 +1483,7 @@ void tst_QTextEdit::mimeDataReimplementations() QCOMPARE(ed.insertCallCount, 0); #ifdef QT_BUILD_INTERNAL - QWidgetTextControl *control = qFindChild(&ed); + QWidgetTextControl *control = ed.findChild(); QVERIFY(control); control->canInsertFromMimeData(QApplication::clipboard()->mimeData()); @@ -2104,7 +2104,7 @@ void tst_QTextEdit::cursorRect() #ifdef QT_BUILD_INTERNAL void tst_QTextEdit::setDocumentPreservesPalette() { - QWidgetTextControl *control = qFindChild(ed); + QWidgetTextControl *control = ed->findChild(); QVERIFY(control); QPalette defaultPal = ed->palette(); -- cgit v1.2.3