Make public headers compile with -Wzero-as-null-pointer-constant

... or equivalent.

QtBase 5.6 headers already compile that way, so let the other
modules follow suit.

Required to change one misuse of reinterpret_cast into static_cast.

Task-number: QTBUG-45291
Change-Id: I8212182c7cd87302aeb16b0cca7e6b0e3ef6c0c6
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

3 files changed, 10 insertions, 10 deletions

diff --git a/src/serviceframework/qremoteserviceregister.h b/src/serviceframework/qremoteserviceregister.h
index 2d6b7c2f..4ea5c738 100644
--- a/src/serviceframework/qremoteserviceregister.h
+++ b/src/serviceframework/qremoteserviceregister.h
@@ -109,7 +109,7 @@ public:
 #endif
     };
 
-    QRemoteServiceRegister(QObject* parent = 0);
+    QRemoteServiceRegister(QObject* parent = Q_NULLPTR);
     ~QRemoteServiceRegister();
 
     template <typename T>
diff --git a/src/serviceframework/qservicemanager.h b/src/serviceframework/qservicemanager.h
index 36c0f887..8cea60fa 100644
--- a/src/serviceframework/qservicemanager.h
+++ b/src/serviceframework/qservicemanager.h
@@ -71,8 +71,8 @@ public:
         UnknownError = 100
     };
 
-    explicit QServiceManager(QObject *parent = 0);
-    explicit QServiceManager(QService::Scope scope, QObject *parent = 0);
+    explicit QServiceManager(QObject *parent = Q_NULLPTR);
+    explicit QServiceManager(QService::Scope scope, QObject *parent = Q_NULLPTR);
     ~QServiceManager();
 
     QService::Scope scope() const;
@@ -140,15 +140,15 @@ Q_INLINE_TEMPLATE T* QServiceManager::loadLocalTypedInterface(const QString& int
 template <class T>
 Q_OUTOFLINE_TEMPLATE T* QServiceManager::loadLocalTypedInterface(const QServiceInterfaceDescriptor& descriptor)
 {
-    T* instance = 0;
+    T* instance = Q_NULLPTR;
     if (descriptor.isValid()) {
         QObject* obj = loadInterface(descriptor);
-        if (!obj) return 0;
+        if (!obj) return Q_NULLPTR;
 
         //TODO this should really be
         //instance = qobject_cast<T *>(loadInterface(descriptor, context, session));
         //check why qobject_cast fails
-        const char* templateClassName = reinterpret_cast<T *>(0)->staticMetaObject.className();
+        const char* templateClassName = static_cast<T *>(Q_NULLPTR)->staticMetaObject.className();
         const QMetaObject* source = obj->metaObject();
         do {
             if (strcmp(templateClassName,source->className())==0) {
@@ -156,7 +156,7 @@ Q_OUTOFLINE_TEMPLATE T* QServiceManager::loadLocalTypedInterface(const QServiceI
                 break;
             }
             source = source->superClass();
-        } while (source != 0);
+        } while (source);
         if (!instance)
             delete obj;
     }
diff --git a/src/serviceframework/qservicereply.h b/src/serviceframework/qservicereply.h
index 7c609437..4e45bed6 100644
--- a/src/serviceframework/qservicereply.h
+++ b/src/serviceframework/qservicereply.h
@@ -48,7 +48,7 @@ class Q_SERVICEFW_EXPORT QServiceReplyBase : public QObject
 {
     Q_OBJECT
 public:
-    explicit QServiceReplyBase(QObject *parent = 0);
+    explicit QServiceReplyBase(QObject *parent = Q_NULLPTR);
     virtual ~QServiceReplyBase();
 
     bool isFinished() const;
@@ -83,9 +83,9 @@ class Q_SERVICEFW_EXPORT QServiceReply : public QServiceReplyBase
 {
     Q_OBJECT
     public:
-    QServiceReply(QObject *p = 0)
+    QServiceReply(QObject *p = Q_NULLPTR)
         : QServiceReplyBase(p),
-          m_proxyObject(0)
+          m_proxyObject(Q_NULLPTR)
     {
         // nothing to do
     }