From 5c4390cc4b29d55a630c1c3827a59dc6e7490bc4 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 1 Jan 2015 20:03:58 -0200 Subject: Remove unused QDBusMessage::timeout member It's been there forever, but never used. The timeout is set during the actual call. I moved QDBusMessage::type only for padding purposes. Change-Id: I41dd638ac423078be642077dbf17439d15b5d405 Reviewed-by: Richard J. Moore Reviewed-by: Alex Blasche --- src/dbus/qdbusmessage.cpp | 4 ++-- src/dbus/qdbusmessage_p.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp index 1751fcce9c..206d6a4b2a 100644 --- a/src/dbus/qdbusmessage.cpp +++ b/src/dbus/qdbusmessage.cpp @@ -61,8 +61,8 @@ static inline const char *data(const QByteArray &arr) } QDBusMessagePrivate::QDBusMessagePrivate() - : msg(0), reply(0), type(QDBusMessage::InvalidMessage), - timeout(-1), localReply(0), ref(1), delayedReply(false), localMessage(false), + : msg(0), reply(0), localReply(0), ref(1), type(QDBusMessage::InvalidMessage), + delayedReply(false), localMessage(false), parametersValidated(false), autoStartService(true) { } diff --git a/src/dbus/qdbusmessage_p.h b/src/dbus/qdbusmessage_p.h index d2f85c3637..2c72c1befe 100644 --- a/src/dbus/qdbusmessage_p.h +++ b/src/dbus/qdbusmessage_p.h @@ -72,10 +72,9 @@ public: DBusMessage *msg; DBusMessage *reply; - QDBusMessage::MessageType type; - int timeout; mutable QDBusMessage *localReply; QAtomicInt ref; + QDBusMessage::MessageType type; mutable uint delayedReply : 1; uint localMessage : 1; -- cgit v1.2.3