diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 11:23:43 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 22:31:13 +0200 |
commit | 48c8322a613f58d19ad9e0262bbac437ce2598f8 (patch) | |
tree | 88ffed3a9617f3b8eb40f08dd1aafeb33cb3a0c2 /src/dbus/qdbusintegrator_p.h | |
parent | 0475460102411979ab51c365cb2bec2c05b69cb4 (diff) |
Use QList instead of QVector in dbus
Omitted type replacement in qDBusParametersForMethod() for now.
Task-number: QTBUG-84469
Change-Id: Ieb9fbb30b431c5e4183ad57acd35640e9556bf6c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/dbus/qdbusintegrator_p.h')
-rw-r--r-- | src/dbus/qdbusintegrator_p.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h index 87db910d25..be6efa4027 100644 --- a/src/dbus/qdbusintegrator_p.h +++ b/src/dbus/qdbusintegrator_p.h @@ -84,7 +84,7 @@ struct QDBusSlotCache { int flags; int slotIdx; - QVector<int> metaTypes; + QList<int> metaTypes; void swap(Data &other) noexcept { @@ -105,9 +105,15 @@ class QDBusCallDeliveryEvent: public QAbstractMetaCallEvent { public: QDBusCallDeliveryEvent(const QDBusConnection &c, int id, QObject *sender, - const QDBusMessage &msg, const QVector<int> &types, int f = 0) - : QAbstractMetaCallEvent(sender, -1), connection(c), message(msg), metaTypes(types), id(id), flags(f) - { } + const QDBusMessage &msg, const QList<int> &types, int f = 0) + : QAbstractMetaCallEvent(sender, -1), + connection(c), + message(msg), + metaTypes(types), + id(id), + flags(f) + { + } void placeMetaCall(QObject *object) override { @@ -117,7 +123,7 @@ public: private: QDBusConnection connection; // just for refcounting QDBusMessage message; - QVector<int> metaTypes; + QList<int> metaTypes; int id; int flags; }; |