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/qscreen | |
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/qscreen')
-rw-r--r-- | tests/manual/qscreen/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/qscreen/propertywatcher.cpp | 2 | ||||
-rw-r--r-- | tests/manual/qscreen/propertywatcher.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/manual/qscreen/main.cpp b/tests/manual/qscreen/main.cpp index 4b9f49e9f0..6fba872b12 100644 --- a/tests/manual/qscreen/main.cpp +++ b/tests/manual/qscreen/main.cpp @@ -100,7 +100,7 @@ class ScreenPropertyWatcher : public PropertyWatcher { Q_OBJECT public: - ScreenPropertyWatcher(QWidget *wp = Q_NULLPTR) : PropertyWatcher(Q_NULLPTR, QString(), wp) + ScreenPropertyWatcher(QWidget *wp = nullptr) : PropertyWatcher(nullptr, QString(), wp) { // workaround for the fact that virtualSiblings is not a property, // thus there is no change notification: diff --git a/tests/manual/qscreen/propertywatcher.cpp b/tests/manual/qscreen/propertywatcher.cpp index 0fb322a480..d2a552f108 100644 --- a/tests/manual/qscreen/propertywatcher.cpp +++ b/tests/manual/qscreen/propertywatcher.cpp @@ -34,7 +34,7 @@ #include "propertyfield.h" PropertyWatcher::PropertyWatcher(QObject *subject, QString annotation, QWidget *parent) - : QWidget(parent), m_subject(Q_NULLPTR), m_formLayout(new QFormLayout(this)) + : QWidget(parent), m_subject(nullptr), m_formLayout(new QFormLayout(this)) { setMinimumSize(450, 300); m_formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); diff --git a/tests/manual/qscreen/propertywatcher.h b/tests/manual/qscreen/propertywatcher.h index f371a3b9b6..d988d96c91 100644 --- a/tests/manual/qscreen/propertywatcher.h +++ b/tests/manual/qscreen/propertywatcher.h @@ -39,7 +39,7 @@ class PropertyWatcher : public QWidget Q_OBJECT public: - explicit PropertyWatcher(QObject* subject = Q_NULLPTR, QString annotation = QString(), QWidget *parent = Q_NULLPTR); + explicit PropertyWatcher(QObject* subject = nullptr, QString annotation = QString(), QWidget *parent = nullptr); QFormLayout *formLayout() { return m_formLayout; } |