summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbuspendingcall_p.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2011-11-16 14:47:11 -0200
committerQt by Nokia <qt-info@nokia.com>2012-03-24 17:07:52 +0100
commite22a6108fda7cac78f5597247ce7b0628b6ba3e2 (patch)
tree49858a35bf398e8137c853bbd258b826adbe8974 /src/dbus/qdbuspendingcall_p.h
parent387ec9c2a35b2b181e2b2ca29079ecb44eac87e9 (diff)
Use QVector<int> instead of QList<int> for storing metatypes in QtDBus
Change I00020eed fixed a bug present in 64-bit machines because it tried to access QList<int>'s internal array data, assuming it was a vector of ints. That worked in 32-bit, but not 64-bit. The fix involves a conversion between QList and QVector. Now fix it properly by changing everything to be QVector. The benefit is that on 64-bit, they are real vectors, not the 50%-overhead pointer array that QList is. Change-Id: I989ad279d0d8b2c9ab262a1eed413ab2365b5461 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/dbus/qdbuspendingcall_p.h')
-rw-r--r--src/dbus/qdbuspendingcall_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbuspendingcall_p.h b/src/dbus/qdbuspendingcall_p.h
index 2aaae7b494..ca3b782a75 100644
--- a/src/dbus/qdbuspendingcall_p.h
+++ b/src/dbus/qdbuspendingcall_p.h
@@ -56,7 +56,7 @@
#include <qshareddata.h>
#include <qpointer.h>
-#include <qlist.h>
+#include <qvector.h>
#include <qmutex.h>
#include <qwaitcondition.h>
@@ -82,7 +82,7 @@ public:
// for the callback mechanism (see setReplyCallback and QDBusConnectionPrivate::sendWithReplyAsync)
QPointer<QObject> receiver;
- QList<int> metaTypes;
+ QVector<int> metaTypes;
int methodIdx;
bool autoDelete;