Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 5 insertions, 5 deletions

diff --git a/src/dbus/qdbusargument_p.h b/src/dbus/qdbusargument_p.h
index 559f8b1186..3553d3d151 100644
--- a/src/dbus/qdbusargument_p.h
+++ b/src/dbus/qdbusargument_p.h
@@ -71,7 +71,7 @@ class QDBusArgumentPrivate
 {
 public:
     inline QDBusArgumentPrivate(int flags = 0)
-        : message(0), ref(1), capabilities(flags)
+        : message(nullptr), ref(1), capabilities(flags)
     { }
     virtual ~QDBusArgumentPrivate();
 
@@ -104,7 +104,7 @@ public:
 class QDBusMarshaller: public QDBusArgumentPrivate
 {
 public:
-    QDBusMarshaller(int flags) : QDBusArgumentPrivate(flags), parent(0), ba(0), closeCode(0), ok(true), skipSignature(false)
+    QDBusMarshaller(int flags) : QDBusArgumentPrivate(flags), parent(nullptr), ba(nullptr), closeCode(0), ok(true), skipSignature(false)
     { direction = Marshalling; }
     ~QDBusMarshaller();
 
@@ -155,13 +155,13 @@ public:
     bool skipSignature;
 
 private:
-    Q_DISABLE_COPY(QDBusMarshaller)
+    Q_DISABLE_COPY_MOVE(QDBusMarshaller)
 };
 
 class QDBusDemarshaller: public QDBusArgumentPrivate
 {
 public:
-    inline QDBusDemarshaller(int flags) : QDBusArgumentPrivate(flags), parent(0)
+    inline QDBusDemarshaller(int flags) : QDBusArgumentPrivate(flags), parent(nullptr)
     { direction = Demarshalling; }
     ~QDBusDemarshaller();
 
@@ -208,7 +208,7 @@ public:
     QDBusDemarshaller *parent;
 
 private:
-    Q_DISABLE_COPY(QDBusDemarshaller)
+    Q_DISABLE_COPY_MOVE(QDBusDemarshaller)
     QString toStringUnchecked();
     QDBusObjectPath toObjectPathUnchecked();
     QDBusSignature toSignatureUnchecked();