diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-30 22:11:15 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-11-04 14:17:08 +0000 |
| commit | 5c57c66d98554f91ce34df387ffc2da18189cf2c (patch) | |
| tree | 4fcb4fbc397b89c416e299db81e3f9ea8194de4f /src/concurrent/qtconcurrentthreadengine.h | |
| parent | 50bda9e2aca69f67da6722e481ce4e9c1a21471b (diff) | |
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>
Diffstat (limited to 'src/concurrent/qtconcurrentthreadengine.h')
| -rw-r--r-- | src/concurrent/qtconcurrentthreadengine.h | 2 |
1 files changed, 1 insertions, 1 deletions
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() { |