diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-06-15 09:09:08 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-15 10:56:29 +0200 |
| commit | 8929c0a3550ae27cb5c9ed276d4c5a85594ba682 (patch) | |
| tree | 56998feaa3acec13cc575a7f95b12b28e4407c44 /src/dbus/qdbusreply.h | |
| parent | af263b003be2f2e111ddc398bc8918cc006fcbb3 (diff) | |
Remove QVariant(int type, void *data, ...) constructor
It was marked internal anyway. Use the constructor taking a
QMetaType instead.
Change-Id: I15b9cd0911aac063a0f0fe0352fa2c84b7f7c691
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/dbus/qdbusreply.h')
| -rw-r--r-- | src/dbus/qdbusreply.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index f7879f2d01..03dfe4a4f0 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -67,7 +67,7 @@ public: inline QDBusReply(const QDBusReply &) = default; inline QDBusReply& operator=(const QDBusMessage &reply) { - QVariant data(qMetaTypeId<Type>(), nullptr); + QVariant data(QMetaType::fromType<Type>()); qDBusReplyFill(reply, m_error, data); m_data = qvariant_cast<Type>(data); return *this; @@ -131,8 +131,7 @@ private: template<> inline QDBusReply<QVariant>& QDBusReply<QVariant>::operator=(const QDBusMessage &reply) { - void *null = nullptr; - QVariant data(qMetaTypeId<QDBusVariant>(), null); + QVariant data(QMetaType::fromType<QDBusVariant>()); qDBusReplyFill(reply, m_error, data); m_data = qvariant_cast<QDBusVariant>(data).variant(); return *this; |