summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbuspendingreply.h
diff options
context:
space:
mode:
authorJesus Fernandez <jesus.fernandez@qt.io>2016-12-05 13:50:53 +0100
committerJesus Fernandez <jesus.fernandez@qt.io>2016-12-06 15:32:26 +0000
commit3c4febf5571e2a34846e6377688676dbd034556b (patch)
treeaaf74aa6b47c2538982eeabbeab25b44bfc42d72 /src/dbus/qdbuspendingreply.h
parent6ff4d8c61afc2ede16d60195dc30ea6538e2d5c9 (diff)
Fix using 0 as null pointer
Fixes: error: zero as null pointer constant. Change-Id: I850d51075263dac6dd135d3cadc136cbd08b40ab Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbuspendingreply.h')
-rw-r--r--src/dbus/qdbuspendingreply.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h
index 786eab2120..da29894d15 100644
--- a/src/dbus/qdbuspendingreply.h
+++ b/src/dbus/qdbuspendingreply.h
@@ -77,7 +77,7 @@ namespace QDBusPendingReplyTypes {
typedef T1 Type;
};
- template<typename T1> inline int metaTypeFor(T1 * = 0)
+ template<typename T1> inline int metaTypeFor(T1 * = nullptr)
{ return qMetaTypeId<T1>(); }
// specialize for QVariant, allowing it to be used in place of QDBusVariant
template<> inline int metaTypeFor<QVariant>(QVariant *)
@@ -91,7 +91,7 @@ namespace QDBusPendingReplyTypes {
enum { Total = Next::Total + 1 };
static inline void fillMetaTypes(int *p)
{
- *p = metaTypeFor<T1>(0);
+ *p = metaTypeFor<T1>(nullptr);
Next::fillMetaTypes(++p);
}
};