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/concurrent/qtconcurrentiteratekernel.h | 2 +- src/concurrent/qtconcurrentthreadengine.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/concurrent') diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h index dbd000e8ba..082fa9e838 100644 --- a/src/concurrent/qtconcurrentiteratekernel.h +++ b/src/concurrent/qtconcurrentiteratekernel.h @@ -159,7 +159,7 @@ public: inline ResultReporter(ThreadEngine *) { } inline void reserveSpace(int) { } inline void reportResults(int) { } - inline void * getPointer() { return Q_NULLPTR; } + inline void * getPointer() { return nullptr; } }; inline bool selectIteration(std::bidirectional_iterator_tag) diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h index 44e714044e..450e7b8d50 100644 --- a/src/concurrent/qtconcurrentthreadengine.h +++ b/src/concurrent/qtconcurrentthreadengine.h @@ -132,7 +132,7 @@ class ThreadEngine : public virtual ThreadEngineBase public: typedef T ResultType; - virtual T *result() { return Q_NULLPTR; } + virtual T *result() { return nullptr; } QFutureInterface *futureInterfaceTyped() { -- cgit v1.2.3