summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbuspendingreply.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-09-09 13:42:35 +0200
committerLars Knoll <lars.knoll@qt.io>2020-09-23 19:30:28 +0200
commit850d850c5af8ff77a4b9d53457ec6b1ba6c20cb3 (patch)
tree79af5853f71ca977c4e24eab609c0f07dcb04a7a /src/dbus/qdbuspendingreply.h
parentbe714154fa3f9dd7f1a44952293eee037793e383 (diff)
Use QMetaType instead of integer based type ids
Change the implementation of Qt DBus to use QMetaType directly instead of integer based type ids. Change-Id: I999023b58fa50dcc3504386467faf09874f7d2cf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbuspendingreply.h')
-rw-r--r--src/dbus/qdbuspendingreply.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h
index 18c02508a0..be1d9b89e1 100644
--- a/src/dbus/qdbuspendingreply.h
+++ b/src/dbus/qdbuspendingreply.h
@@ -58,7 +58,7 @@ protected:
void assign(const QDBusMessage &message);
QVariant argumentAt(int index) const;
- void setMetaTypes(int count, const int *metaTypes);
+ void setMetaTypes(int count, const QMetaType *metaTypes);
};
namespace QDBusPendingReplyTypes {
@@ -144,7 +144,7 @@ private:
if constexpr (Count == 0) {
setMetaTypes(0, nullptr);
} else {
- std::array<int, Count> typeIds = { QDBusPendingReplyTypes::metaTypeFor<Types>().id()... };
+ std::array<QMetaType, Count> typeIds = { QDBusPendingReplyTypes::metaTypeFor<Types>()... };
setMetaTypes(Count, typeIds.data());
}
}