From b4ead572501179244aa036e7a590fa7536929f2b Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 14 May 2019 15:04:18 +0200
Subject: Move away from using 0 as a pointer constant

Cleans up most of corelib to use nullptr or default enums
where appropriate.

Change-Id: Ifcaac14ecdaaee730f87f10941db3ce407d71ef9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/kernel/qmetatype_p.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/corelib/kernel/qmetatype_p.h')

diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h
index 0846193e66..97d6001937 100644
--- a/src/corelib/kernel/qmetatype_p.h
+++ b/src/corelib/kernel/qmetatype_p.h
@@ -140,12 +140,12 @@ public:
     /*saveOp*/(QtMetaTypePrivate::QMetaTypeFunctionHelper<Type, QtMetaTypePrivate::TypeDefinition<Type>::IsAvailable>::Save), \
     /*loadOp*/(QtMetaTypePrivate::QMetaTypeFunctionHelper<Type, QtMetaTypePrivate::TypeDefinition<Type>::IsAvailable>::Load),
 #  define QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type) \
-    /*saveOp*/ 0, \
-    /*loadOp*/ 0,
+    /*saveOp*/ nullptr, \
+    /*loadOp*/ nullptr,
 #else
 #  define QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type) \
-    /*saveOp*/ 0, \
-    /*loadOp*/ 0,
+    /*saveOp*/ nullptr, \
+    /*loadOp*/ nullptr,
 #  define QT_METATYPE_INTERFACE_INIT_DATASTREAM_IMPL(Type) \
     QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type)
 #endif
@@ -153,7 +153,7 @@ public:
 #ifndef QT_BOOTSTRAPPED
 #define METAOBJECT_DELEGATE(Type) (QtPrivate::MetaObjectForType<Type>::value())
 #else
-#define METAOBJECT_DELEGATE(Type) 0
+#define METAOBJECT_DELEGATE(Type) nullptr
 #endif
 
 #define QT_METATYPE_INTERFACE_INIT_IMPL(Type, DATASTREAM_DELEGATE) \
@@ -184,11 +184,11 @@ public:
 #define QT_METATYPE_INTERFACE_INIT_EMPTY() \
 { \
     QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(void) \
-    /*constructor*/ 0, \
-    /*destructor*/ 0, \
+    /*constructor*/ nullptr, \
+    /*destructor*/ nullptr, \
     /*size*/ 0, \
     /*flags*/ 0, \
-    /*metaObject*/ 0 , \
+    /*metaObject*/ nullptr , \
     /*typedConstructor*/ nullptr, \
     /*typedDestructor*/ nullptr \
 }
-- 
cgit v1.2.3