summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2015-01-01 20:03:58 -0200
committerThiago Macieira <thiago.macieira@intel.com>2015-01-06 19:41:47 +0100
commit5c4390cc4b29d55a630c1c3827a59dc6e7490bc4 (patch)
tree3ca26c5b0e2bb0c95cd5d0b92b6517676562fb22 /src
parent171644cb47b97546ef3f78a7ad0f43d0d52cc332 (diff)
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 <rich@kde.org> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/dbus/qdbusmessage.cpp4
-rw-r--r--src/dbus/qdbusmessage_p.h3
2 files changed, 3 insertions, 4 deletions
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;