From b85095d0560098da7ba60e7df7c438448d33cffb Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 17 Dec 2020 22:07:28 +0000 Subject: [PATCH] properly initialize QDBusArgumentPrivate::direction member Signed-off-by: Ivailo Monev --- src/dbus/qdbusargument_p.h | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/dbus/qdbusargument_p.h b/src/dbus/qdbusargument_p.h index 9d85ca392..7b8b10328 100644 --- a/src/dbus/qdbusargument_p.h +++ b/src/dbus/qdbusargument_p.h @@ -57,8 +57,13 @@ class QDBusDemarshaller; class QDBusArgumentPrivate { public: - inline QDBusArgumentPrivate(int flags = 0) - : message(0), ref(1), capabilities(flags) + enum Direction { + Marshalling, + Demarshalling + }; + + inline QDBusArgumentPrivate(Direction direct, int cap) + : message(Q_NULLPTR), ref(1), direction(direct), capabilities(cap) { } ~QDBusArgumentPrivate(); @@ -81,18 +86,16 @@ public: public: DBusMessage *message; QAtomicInt ref; + Direction direction; int capabilities; - enum Direction { - Marshalling, - Demarshalling - } direction; }; class QDBusMarshaller: public QDBusArgumentPrivate { public: - QDBusMarshaller(int flags) : QDBusArgumentPrivate(flags), parent(0), ba(0), closeCode(0), ok(true) - { direction = Marshalling; } + QDBusMarshaller(int flags) : QDBusArgumentPrivate(Marshalling, flags), + parent(Q_NULLPTR), ba(Q_NULLPTR), closeCode(0), ok(true) + { } ~QDBusMarshaller(); QString currentSignature(); @@ -146,8 +149,9 @@ private: class QDBusDemarshaller: public QDBusArgumentPrivate { public: - inline QDBusDemarshaller(int flags) : QDBusArgumentPrivate(flags), parent(0) - { direction = Demarshalling; } + inline QDBusDemarshaller(int flags) : QDBusArgumentPrivate(Demarshalling, flags), + parent(Q_NULLPTR) + { } ~QDBusDemarshaller(); QString currentSignature();