From 5c57c66d98554f91ce34df387ffc2da18189cf2c Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
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 <thiago.macieira@intel.com>
---
 src/concurrent/qtconcurrentthreadengine.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/concurrent/qtconcurrentthreadengine.h')

diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h
index a9df3d24b5..5388f60a76 100644
--- a/src/concurrent/qtconcurrentthreadengine.h
+++ b/src/concurrent/qtconcurrentthreadengine.h
@@ -126,7 +126,7 @@ class ThreadEngine : public virtual ThreadEngineBase
 public:
     typedef T ResultType;
 
-    virtual T *result() { return 0; }
+    virtual T *result() { return Q_NULLPTR; }
 
     QFutureInterface<T> *futureInterfaceTyped()
     {
-- 
cgit v1.2.3