summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Astals Cid <albert.astals.cid@kdab.com>2018-06-26 16:54:50 +0200
committerAlbert Astals Cid <albert.astals.cid@kdab.com>2018-07-05 15:22:35 +0000
commitfddf09363e1bbc6f6549eaf28def7699b2d87341 (patch)
treed4693f5db88d6405a1957cbcee33354cf3502d87
parent340472534cec2bccd634b1e366c2f654a3448fac (diff)
QFutureInterface::reportFinished use nullptr instead of 0
So that users don't get a warning if using -Wzero-as-null-pointer-constant Change-Id: Ia15b5f380a2f6a93e05eec06646608e480cdf5d2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/thread/qfutureinterface.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h
index 3dd236752c..d5e2401eee 100644
--- a/src/corelib/thread/qfutureinterface.h
+++ b/src/corelib/thread/qfutureinterface.h
@@ -178,7 +178,7 @@ public:
inline void reportResult(const T *result, int index = -1);
inline void reportResult(const T &result, int index = -1);
inline void reportResults(const QVector<T> &results, int beginIndex = -1, int count = -1);
- inline void reportFinished(const T *result = 0);
+ inline void reportFinished(const T *result = nullptr);
inline const T &resultReference(int index) const;
inline const T *resultPointer(int index) const;