properly initialize QDBusArgumentPrivate::direction member

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-12-17 22:07:28 +00:00
parent 74b79cebd3
commit b85095d056

View file

@ -57,8 +57,13 @@ class QDBusDemarshaller;
class QDBusArgumentPrivate class QDBusArgumentPrivate
{ {
public: public:
inline QDBusArgumentPrivate(int flags = 0) enum Direction {
: message(0), ref(1), capabilities(flags) Marshalling,
Demarshalling
};
inline QDBusArgumentPrivate(Direction direct, int cap)
: message(Q_NULLPTR), ref(1), direction(direct), capabilities(cap)
{ } { }
~QDBusArgumentPrivate(); ~QDBusArgumentPrivate();
@ -81,18 +86,16 @@ public:
public: public:
DBusMessage *message; DBusMessage *message;
QAtomicInt ref; QAtomicInt ref;
Direction direction;
int capabilities; int capabilities;
enum Direction {
Marshalling,
Demarshalling
} direction;
}; };
class QDBusMarshaller: public QDBusArgumentPrivate class QDBusMarshaller: public QDBusArgumentPrivate
{ {
public: public:
QDBusMarshaller(int flags) : QDBusArgumentPrivate(flags), parent(0), ba(0), closeCode(0), ok(true) QDBusMarshaller(int flags) : QDBusArgumentPrivate(Marshalling, flags),
{ direction = Marshalling; } parent(Q_NULLPTR), ba(Q_NULLPTR), closeCode(0), ok(true)
{ }
~QDBusMarshaller(); ~QDBusMarshaller();
QString currentSignature(); QString currentSignature();
@ -146,8 +149,9 @@ private:
class QDBusDemarshaller: public QDBusArgumentPrivate class QDBusDemarshaller: public QDBusArgumentPrivate
{ {
public: public:
inline QDBusDemarshaller(int flags) : QDBusArgumentPrivate(flags), parent(0) inline QDBusDemarshaller(int flags) : QDBusArgumentPrivate(Demarshalling, flags),
{ direction = Demarshalling; } parent(Q_NULLPTR)
{ }
~QDBusDemarshaller(); ~QDBusDemarshaller();
QString currentSignature(); QString currentSignature();