From ef5444e921c01c107a0ab9b9a71391ca6d5d0eab Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 11 Mar 2015 21:25:10 +0100 Subject: [PATCH] Port to qt5 --- .../autotests/potentialphishingdetaildialogtest.cpp | 2 +- .../autotests/potentialphishingdetailwidgettest.cpp | 10 +++++----- mailmerge/autotests/mailmergedialogtest.cpp | 2 +- mailmerge/autotests/selectattachmentdialogtest.cpp | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp b/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp index 2b1adb312..76f54f920 100644 --- a/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp +++ b/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp @@ -39,7 +39,7 @@ PotentialPhishingDetailDialogTest::~PotentialPhishingDetailDialogTest() void PotentialPhishingDetailDialogTest::shouldHaveDefaultValue() { PotentialPhishingDetailDialog dlg; - PotentialPhishingDetailWidget *w = qFindChild(&dlg, QLatin1String("potentialphising_widget")); + PotentialPhishingDetailWidget *w = dlg.findChild(QLatin1String("potentialphising_widget")); QVERIFY(w); } diff --git a/editor/potentialphishingemail/autotests/potentialphishingdetailwidgettest.cpp b/editor/potentialphishingemail/autotests/potentialphishingdetailwidgettest.cpp index cfa545502..c1c0c6b9f 100644 --- a/editor/potentialphishingemail/autotests/potentialphishingdetailwidgettest.cpp +++ b/editor/potentialphishingemail/autotests/potentialphishingdetailwidgettest.cpp @@ -38,10 +38,10 @@ PotentialPhishingDetailWidgetTest::~PotentialPhishingDetailWidgetTest() void PotentialPhishingDetailWidgetTest::shouldHaveDefaultValue() { PotentialPhishingDetailWidget dlg; - QLabel *searchLabel = qFindChild(&dlg, QLatin1String("label")); + QLabel *searchLabel = dlg.findChild(QLatin1String("label")); QVERIFY(searchLabel); - QListWidget *listWidget = qFindChild(&dlg, QLatin1String("list_widget")); + QListWidget *listWidget = dlg.findChild(QLatin1String("list_widget")); QVERIFY(listWidget); QCOMPARE(listWidget->count(), 0); } @@ -49,7 +49,7 @@ void PotentialPhishingDetailWidgetTest::shouldHaveDefaultValue() void PotentialPhishingDetailWidgetTest::shouldFillList() { PotentialPhishingDetailWidget dlg; - QListWidget *listWidget = qFindChild(&dlg, QLatin1String("list_widget")); + QListWidget *listWidget = dlg.findChild(QLatin1String("list_widget")); QStringList lst; lst << QLatin1String("bla"); lst << QLatin1String("bli"); @@ -61,7 +61,7 @@ void PotentialPhishingDetailWidgetTest::shouldFillList() void PotentialPhishingDetailWidgetTest::shouldClearListBeforeToAddNew() { PotentialPhishingDetailWidget dlg; - QListWidget *listWidget = qFindChild(&dlg, QLatin1String("list_widget")); + QListWidget *listWidget = dlg.findChild(QLatin1String("list_widget")); QStringList lst; lst << QLatin1String("bla"); lst << QLatin1String("bli"); @@ -78,7 +78,7 @@ void PotentialPhishingDetailWidgetTest::shouldClearListBeforeToAddNew() void PotentialPhishingDetailWidgetTest::shouldNotAddDuplicateEntries() { PotentialPhishingDetailWidget dlg; - QListWidget *listWidget = qFindChild(&dlg, QLatin1String("list_widget")); + QListWidget *listWidget = dlg.findChild(QLatin1String("list_widget")); QStringList lst; lst << QLatin1String("bla"); lst << QLatin1String("blo"); diff --git a/mailmerge/autotests/mailmergedialogtest.cpp b/mailmerge/autotests/mailmergedialogtest.cpp index 46ea97aa6..98d5a681d 100644 --- a/mailmerge/autotests/mailmergedialogtest.cpp +++ b/mailmerge/autotests/mailmergedialogtest.cpp @@ -34,7 +34,7 @@ void MailMergeDialogTest::shouldHaveDefaultValue() { MailMerge::MailMergeDialog dlg; - QDialogButtonBox *buttonBox = qFindChild(&dlg, QLatin1String("buttonbox")); + QDialogButtonBox *buttonBox = dlg.findChild(QLatin1String("buttonbox")); QVERIFY(buttonBox); } diff --git a/mailmerge/autotests/selectattachmentdialogtest.cpp b/mailmerge/autotests/selectattachmentdialogtest.cpp index 700a21434..b58c470f9 100644 --- a/mailmerge/autotests/selectattachmentdialogtest.cpp +++ b/mailmerge/autotests/selectattachmentdialogtest.cpp @@ -34,9 +34,9 @@ SelectAttachmentDialogTest::~SelectAttachmentDialogTest() void SelectAttachmentDialogTest::shouldHaveDefaultValue() { MailMerge::SelectAttachmentDialog dlg; - QLabel *lab = qFindChild(&dlg, QLatin1String("selectattachment_label")); + QLabel *lab = dlg.findChild(QLatin1String("selectattachment_label")); QVERIFY(lab); - KUrlRequester *urlRequester = qFindChild(&dlg, QLatin1String("urlrequester")); + KUrlRequester *urlRequester = dlg.findChild(QLatin1String("urlrequester")); QVERIFY(urlRequester); }