diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 11:49:52 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:55 +0000 |
| commit | 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 (patch) | |
| tree | 7f600686e4dd92681bec09ac745a9dcd4425844b /tests/manual/qlayout | |
| parent | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (diff) | |
Replace Q_NULLPTR with nullptr where possible
Remaining uses of Q_NULLPTR are in:
src/corelib/global/qcompilerdetection.h
(definition and documentation of Q_NULLPTR)
tests/manual/qcursor/qcursorhighdpi/main.cpp
(a test executable compilable both under Qt4 and Qt5)
Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'tests/manual/qlayout')
| -rw-r--r-- | tests/manual/qlayout/gridwidget.cpp | 4 | ||||
| -rw-r--r-- | tests/manual/qlayout/hbwidget.cpp | 4 | ||||
| -rw-r--r-- | tests/manual/qlayout/vbwidget.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/manual/qlayout/gridwidget.cpp b/tests/manual/qlayout/gridwidget.cpp index ede13a22c3..f19b3eac6f 100644 --- a/tests/manual/qlayout/gridwidget.cpp +++ b/tests/manual/qlayout/gridwidget.cpp @@ -62,8 +62,8 @@ GridWidget::GridWidget(QWidget *parent) : qDebug("There should be four warnings, but no crash or freeze:"); hb->addWidget(this, 6, 6); ///< This command should print a warning, but should not add "this" - hb->addWidget(Q_NULLPTR, 6, 7); ///< This command should print a warning, but should not add "NULL" + hb->addWidget(nullptr, 6, 7); ///< This command should print a warning, but should not add "NULL" hb->addLayout(hb, 7, 6); ///< This command should print a warning, but should not add "hb" - hb->addLayout(Q_NULLPTR, 7, 7); ///< This command should print a warning, but should not add "NULL" + hb->addLayout(nullptr, 7, 7); ///< This command should print a warning, but should not add "NULL" qDebug("Neither crashed nor frozen"); } diff --git a/tests/manual/qlayout/hbwidget.cpp b/tests/manual/qlayout/hbwidget.cpp index d1f6c94d5b..80219d01fd 100644 --- a/tests/manual/qlayout/hbwidget.cpp +++ b/tests/manual/qlayout/hbwidget.cpp @@ -58,8 +58,8 @@ HbWidget::HbWidget(QWidget *parent) : qDebug("There should be four warnings, but no crash or freeze:"); hb->addWidget(this); ///< This command should print a warning, but should not add "this" - hb->addWidget(Q_NULLPTR); ///< This command should print a warning, but should not add "NULL" + hb->addWidget(nullptr); ///< This command should print a warning, but should not add "NULL" hb->addLayout(hb); ///< This command should print a warning, but should not add "hb" - hb->addLayout(Q_NULLPTR); ///< This command should print a warning, but should not add "NULL" + hb->addLayout(nullptr); ///< This command should print a warning, but should not add "NULL" qDebug("Neither crashed nor frozen"); } diff --git a/tests/manual/qlayout/vbwidget.cpp b/tests/manual/qlayout/vbwidget.cpp index d3898422fb..97f240f9a0 100644 --- a/tests/manual/qlayout/vbwidget.cpp +++ b/tests/manual/qlayout/vbwidget.cpp @@ -58,8 +58,8 @@ VbWidget::VbWidget(QWidget *parent) : qDebug("There should be four warnings, but no crash or freeze:"); hb->addWidget(this); ///< This command should print a warning, but should not add "this" - hb->addWidget(Q_NULLPTR); ///< This command should print a warning, but should not add "NULL" + hb->addWidget(nullptr); ///< This command should print a warning, but should not add "NULL" hb->addLayout(hb); ///< This command should print a warning, but should not add "hb" - hb->addLayout(Q_NULLPTR); ///< This command should print a warning, but should not add "NULL" + hb->addLayout(nullptr); ///< This command should print a warning, but should not add "NULL" qDebug("Neither crashed nor frozen"); } |