9 files changed, 22 insertions, 22 deletions
diff --git a/src/publishsubscribe/qvaluespacepublisher.h b/src/publishsubscribe/qvaluespacepublisher.h
index 8e5d5798..4d09e3df 100644
--- a/src/publishsubscribe/qvaluespacepublisher.h
+++ b/src/publishsubscribe/qvaluespacepublisher.h
@@ -48,9 +48,9 @@ class Q_PUBLISHSUBSCRIBE_EXPORT QValueSpacePublisher : public QObject
     Q_OBJECT
 
 public:
-    explicit QValueSpacePublisher(const QString &path, QObject *parent = 0);
-    QValueSpacePublisher(QValueSpace::LayerOptions filter, const QString &path, QObject *parent = 0);
-    QValueSpacePublisher(const QUuid &uuid, const QString &path, QObject *parent = 0);
+    explicit QValueSpacePublisher(const QString &path, QObject *parent = Q_NULLPTR);
+    QValueSpacePublisher(QValueSpace::LayerOptions filter, const QString &path, QObject *parent = Q_NULLPTR);
+    QValueSpacePublisher(const QUuid &uuid, const QString &path, QObject *parent = Q_NULLPTR);
     virtual ~QValueSpacePublisher();
 
     bool isConnected() const;
diff --git a/src/publishsubscribe/qvaluespacesubscriber.h b/src/publishsubscribe/qvaluespacesubscriber.h
index 50837502..6496b445 100644
--- a/src/publishsubscribe/qvaluespacesubscriber.h
+++ b/src/publishsubscribe/qvaluespacesubscriber.h
@@ -51,10 +51,10 @@ class Q_PUBLISHSUBSCRIBE_EXPORT QValueSpaceSubscriber : public QObject
     Q_PROPERTY(QVariant value READ valuex NOTIFY contentsChanged)
 
 public:
-    explicit QValueSpaceSubscriber(QObject *parent = 0);
-    explicit QValueSpaceSubscriber(const QString &path, QObject *parent = 0);
-    QValueSpaceSubscriber(QValueSpace::LayerOptions filter, const QString &path, QObject *parent = 0);
-    QValueSpaceSubscriber(const QUuid &uuid, const QString &path, QObject *parent = 0);
+    explicit QValueSpaceSubscriber(QObject *parent = Q_NULLPTR);
+    explicit QValueSpaceSubscriber(const QString &path, QObject *parent = Q_NULLPTR);
+    QValueSpaceSubscriber(QValueSpace::LayerOptions filter, const QString &path, QObject *parent = Q_NULLPTR);
+    QValueSpaceSubscriber(const QUuid &uuid, const QString &path, QObject *parent = Q_NULLPTR);
     virtual ~QValueSpaceSubscriber();
 
     bool isConnected() const;
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
     }
diff --git a/src/systeminfo/qbatteryinfo.h b/src/systeminfo/qbatteryinfo.h
index a8d2ba7c..cf839c6c 100644
--- a/src/systeminfo/qbatteryinfo.h
+++ b/src/systeminfo/qbatteryinfo.h
@@ -100,8 +100,8 @@ public:
         HealthBad
     };
 
-    QBatteryInfo(QObject *parent = 0);
-    QBatteryInfo(int batteryIndex, QObject *parent = 0);
+    QBatteryInfo(QObject *parent = Q_NULLPTR);
+    QBatteryInfo(int batteryIndex, QObject *parent = Q_NULLPTR);
     virtual ~QBatteryInfo();
 
     int batteryCount() const;
diff --git a/src/systeminfo/qdeviceinfo.h b/src/systeminfo/qdeviceinfo.h
index 2b860c47..b6f8df0d 100644
--- a/src/systeminfo/qdeviceinfo.h
+++ b/src/systeminfo/qdeviceinfo.h
@@ -101,7 +101,7 @@ public:
         Firmware
     };
 
-    QDeviceInfo(QObject *parent = 0);
+    QDeviceInfo(QObject *parent = Q_NULLPTR);
     virtual ~QDeviceInfo();
 
     QDeviceInfo::LockTypeFlags activatedLocks() const;
diff --git a/src/systeminfo/qnetworkinfo.h b/src/systeminfo/qnetworkinfo.h
index 4db6c200..4a305cde 100644
--- a/src/systeminfo/qnetworkinfo.h
+++ b/src/systeminfo/qnetworkinfo.h
@@ -84,7 +84,7 @@ public:
         // ,Connected //desktop
     };
 
-    QNetworkInfo(QObject *parent = 0);
+    QNetworkInfo(QObject *parent = Q_NULLPTR);
     virtual ~QNetworkInfo();
 
     int networkInterfaceCount(QNetworkInfo::NetworkMode mode) const;
diff --git a/src/systeminfo/qscreensaver.h b/src/systeminfo/qscreensaver.h
index 54c33c4f..bf4d3be2 100644
--- a/src/systeminfo/qscreensaver.h
+++ b/src/systeminfo/qscreensaver.h
@@ -48,7 +48,7 @@ class Q_SYSTEMINFO_EXPORT QScreenSaver : public QObject
     Q_PROPERTY(bool screenSaverEnabled READ screenSaverEnabled WRITE setScreenSaverEnabled)
 
 public:
-    QScreenSaver(QObject *parent = 0);
+    QScreenSaver(QObject *parent = Q_NULLPTR);
     virtual ~QScreenSaver();
 
     bool screenSaverEnabled() const;