From 5c57c66d98554f91ce34df387ffc2da18189cf2c Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 30 Jun 2015 22:11:15 +0200 Subject: QtConcurrent: Use Q_NULLPTR instead of 0 in all public headers This is in preparation of adding -Wzero-as-null-pointer-constant (or similar) to the headers check. Since QtConcurrent is basically all-templates, not all uses of 0 as nullptr might have been detected by the headersclean check. Task-number: QTBUG-45291 Change-Id: Iffcabdbab26b56597700346cd039d0c32c4fddca Reviewed-by: Thiago Macieira --- src/concurrent/qtconcurrentiteratekernel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/concurrent/qtconcurrentiteratekernel.h') diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h index d68172e1e6..32acf03338 100644 --- a/src/concurrent/qtconcurrentiteratekernel.h +++ b/src/concurrent/qtconcurrentiteratekernel.h @@ -127,7 +127,7 @@ public: inline ResultReporter(ThreadEngine *) { } inline void reserveSpace(int) { } inline void reportResults(int) { } - inline void * getPointer() { return 0; } + inline void * getPointer() { return Q_NULLPTR; } }; inline bool selectIteration(std::bidirectional_iterator_tag) -- cgit v1.2.3