diff options
Diffstat (limited to 'tests/auto/widgets/dialogs')
7 files changed, 19 insertions, 19 deletions
diff --git a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp index 413b865f04..c329ca9f3e 100644 --- a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp +++ b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp @@ -58,7 +58,7 @@ class TestNativeDialog : public QColorDialog public: QWidget *m_activeModalWidget; - TestNativeDialog(QWidget *parent = 0) + TestNativeDialog(QWidget *parent = nullptr) : QColorDialog(parent), m_activeModalWidget(0) { QTimer::singleShot(1, this, SLOT(test_activeModalWidgetSignal())); diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index 266ed0de05..cc613b8218 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -98,7 +98,7 @@ void tst_QDialog::getSetCheck() class ToolDialog : public QDialog { public: - ToolDialog(QWidget *parent = 0) + ToolDialog(QWidget *parent = nullptr) : QDialog(parent, Qt::Tool), mWasActive(false), mWasModalWindow(false), tId(-1) {} bool wasActive() const { return mWasActive; } diff --git a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp index a4204da20e..49ecc7305d 100644 --- a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp +++ b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp @@ -44,7 +44,7 @@ void tst_QErrorMessage::dontShowAgain() { QString plainString = QLatin1String("foo"); QString htmlString = QLatin1String("foo<br>bar"); - QCheckBox *checkBox = 0; + QCheckBox *checkBox = nullptr; QErrorMessage errorMessageDialog(0); @@ -92,7 +92,7 @@ void tst_QErrorMessage::dontShowCategoryAgain() { QString htmlString = QLatin1String("foo<br>bar"); QString htmlString2 = QLatin1String("foo2<br>bar2"); - QCheckBox *checkBox = 0; + QCheckBox *checkBox = nullptr; QErrorMessage errorMessageDialog(0); diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 4b9466d3b6..e070f74ae5 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -365,7 +365,7 @@ void tst_QFiledialog::filterSelectedSignal() void tst_QFiledialog::args() { - QWidget *parent = 0; + QWidget *parent = nullptr; QString caption = "caption"; QString directory = QDir::tempPath(); QString filter = "*.mp3"; diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index 45ed5d7d21..92ca7f005c 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -918,7 +918,7 @@ void tst_QFileDialog2::task239706_editableFilterCombo() QVERIFY(QTest::qWaitForWindowExposed(&d)); QList<QComboBox *> comboList = d.findChildren<QComboBox *>(); - QComboBox *filterCombo = 0; + QComboBox *filterCombo = nullptr; foreach (QComboBox *combo, comboList) { if (combo->objectName() == QString("fileTypeCombo")) { filterCombo = combo; @@ -991,7 +991,7 @@ void tst_QFileDialog2::task251321_sideBarHiddenEntries() class MyQSideBar : public QSidebar { public : - MyQSideBar(QWidget *parent = 0) : QSidebar(parent) + MyQSideBar(QWidget *parent = nullptr) : QSidebar(parent) {} void removeSelection() { diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index 3e8a81c33c..b8d2a4617c 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -372,11 +372,11 @@ void tst_QWizard::setButton() QVERIFY(qobject_cast<QCheckBox *>(wizard.button(QWizard::CustomButton2))); QVERIFY(qobject_cast<QPushButton *>(wizard.button(QWizard::CustomButton1))); - QVERIFY(toolButton != 0); + QVERIFY(toolButton != nullptr); // resetting the same button does nothing wizard.setButton(QWizard::NextButton, toolButton); - QVERIFY(toolButton != 0); + QVERIFY(toolButton != nullptr); // revert to default button wizard.setButton(QWizard::NextButton, 0); @@ -470,8 +470,8 @@ public: } void registerField(const QString &name, QWidget *widget, - const char *property = 0, - const char *changedSignal = 0) + const char *property = nullptr, + const char *changedSignal = nullptr) { QWizardPage::registerField(name, widget, property, changedSignal); } QLineEdit *edit1; @@ -2409,7 +2409,7 @@ void tst_QWizard::sideWidget() { QWizard wizard; - wizard.setSideWidget(0); + wizard.setSideWidget(nullptr); QVERIFY(!wizard.sideWidget()); QScopedPointer<QWidget> w1(new QWidget(&wizard)); wizard.setSideWidget(w1.data()); @@ -2417,11 +2417,11 @@ void tst_QWizard::sideWidget() QWidget *w2 = new QWidget(&wizard); wizard.setSideWidget(w2); QCOMPARE(wizard.sideWidget(), w2); - QVERIFY(w1->parent() != 0); + QVERIFY(w1->parent() != nullptr); QCOMPARE(w1->window(), static_cast<QWidget *>(&wizard)); QCOMPARE(w2->window(), static_cast<QWidget *>(&wizard)); - w1->setParent(0); - wizard.setSideWidget(0); + w1->setParent(nullptr); + wizard.setSideWidget(nullptr); QVERIFY(!wizard.sideWidget()); } @@ -2498,7 +2498,7 @@ void tst_QWizard::task177716_disableCommitButton() class WizardPage_task183550 : public QWizardPage { public: - WizardPage_task183550(QWidget *parent = 0) + WizardPage_task183550(QWidget *parent = nullptr) : QWizardPage(parent) , treeWidget(new QTreeWidget) , verticalPolicy(QSizePolicy::MinimumExpanding) {} diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp index cc48543a76..e090c0d851 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp @@ -41,7 +41,7 @@ class taskQTBUG_25691 : public QWizard { Q_OBJECT public: - taskQTBUG_25691( QWidget * parent = 0 ); + taskQTBUG_25691( QWidget * parent = nullptr ); ~taskQTBUG_25691(void); }; @@ -50,7 +50,7 @@ class taskQTBUG_25691Page1 : public QWizardPage { Q_OBJECT public: - taskQTBUG_25691Page1( QWidget * parent = 0 ); + taskQTBUG_25691Page1( QWidget * parent = nullptr ); ~taskQTBUG_25691Page1(void); }; @@ -59,7 +59,7 @@ class taskQTBUG_25691Page2 : public QWizardPage { Q_OBJECT public: - taskQTBUG_25691Page2( QWidget * parent = 0 ); + taskQTBUG_25691Page2( QWidget * parent = nullptr ); virtual void initializePage(void) override; |