From 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 11:49:52 +0200 Subject: 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 Reviewed-by: Lars Knoll Reviewed-by: Olivier Goffart (Woboq GmbH) --- tests/manual/qscreen/main.cpp | 2 +- tests/manual/qscreen/propertywatcher.cpp | 2 +- tests/manual/qscreen/propertywatcher.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/manual/qscreen') 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; } -- cgit v1.2.3