diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2011-11-16 14:47:11 -0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-24 17:07:52 +0100 |
commit | e22a6108fda7cac78f5597247ce7b0628b6ba3e2 (patch) | |
tree | 49858a35bf398e8137c853bbd258b826adbe8974 /src/dbus/qdbusintegrator_p.h | |
parent | 387ec9c2a35b2b181e2b2ca29079ecb44eac87e9 (diff) | |
download | qtbase-e22a6108fda7cac78f5597247ce7b0628b6ba3e2.tar.gz |
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/qdbusintegrator_p.h')
-rw-r--r-- | src/dbus/qdbusintegrator_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h index c9a2efc57d..f910d2d009 100644 --- a/src/dbus/qdbusintegrator_p.h +++ b/src/dbus/qdbusintegrator_p.h @@ -84,7 +84,7 @@ struct QDBusSlotCache { int flags; int slotIdx; - QList<int> metaTypes; + QVector<int> metaTypes; }; typedef QMultiHash<QString, Data> Hash; Hash hash; @@ -94,7 +94,7 @@ class QDBusCallDeliveryEvent: public QMetaCallEvent { public: QDBusCallDeliveryEvent(const QDBusConnection &c, int id, QObject *sender, - const QDBusMessage &msg, const QList<int> &types, int f = 0) + const QDBusMessage &msg, const QVector<int> &types, int f = 0) : QMetaCallEvent(0, id, 0, sender, -1), connection(c), message(msg), metaTypes(types), flags(f) { } @@ -106,7 +106,7 @@ public: private: QDBusConnection connection; // just for refcounting QDBusMessage message; - QList<int> metaTypes; + QVector<int> metaTypes; int flags; }; |