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) --- src/dbus/qdbusvirtualobject.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dbus/qdbusvirtualobject.h') diff --git a/src/dbus/qdbusvirtualobject.h b/src/dbus/qdbusvirtualobject.h index 1a96d900b4..b69e21b378 100644 --- a/src/dbus/qdbusvirtualobject.h +++ b/src/dbus/qdbusvirtualobject.h @@ -56,7 +56,7 @@ class Q_DBUS_EXPORT QDBusVirtualObject : public QObject { Q_OBJECT public: - explicit QDBusVirtualObject(QObject *parent = Q_NULLPTR); + explicit QDBusVirtualObject(QObject *parent = nullptr); virtual ~QDBusVirtualObject(); virtual QString introspect(const QString &path) const = 0; -- cgit v1.2.3